diff --git a/.asf.yaml b/.asf.yaml
index 8bd6ce570b5..c7e617cd9c9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -66,6 +66,16 @@ github:
         # strict means "Require branches to be up to date before merging".
         strict: true
         # contexts are the names of checks that must pass
+        contexts:
+          - frontend (ubuntu-latest, 18)
+          - frontend (windows-latest, 18)
+          - frontend (macos-latest, 18)
+          - scala (ubuntu-22.04, 11)
+          - python (ubuntu-latest, 3.10)
+          - python (ubuntu-latest, 3.11)
+          - python (ubuntu-latest, 3.12)
+          - Check License Headers
+          - Validate PR title
       required_pull_request_reviews:
         dismiss_stale_reviews: false
         require_code_owner_reviews: false
@@ -74,10 +84,7 @@ github:
 
 notifications:
   commits:              commits@texera.apache.org
-  issues:               dev@texera.apache.org
-  pullrequests:         dev@texera.apache.org
-  discussions:          dev@texera.apache.org
+  issues:               notifications@texera.apache.org
+  pullrequests:         notifications@texera.apache.org
+  discussions:          notifications@texera.apache.org
   jobs:                 commits@texera.apache.org
-
-publish:
-  whoami: asf-site
diff --git a/.github/ISSUE_TEMPLATE/bug-template.yaml b/.github/ISSUE_TEMPLATE/bug-template.yaml
new file mode 100644
index 00000000000..7a3ebc92022
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-template.yaml
@@ -0,0 +1,81 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Bug Report
+description: File a bug report.
+labels: ["triage"]
+type: "Bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: How to reproduce?
+      description: Please include steps for a repro.
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of Texera are you running?
+      options:
+        - 1.1.0-incubating (Pre-release/Master)
+        - 1.0.0
+      default: 0
+    validations:
+      required: true
+  - type: input
+    id: commit-hash
+    attributes:
+      label: Commit Hash (Optional)
+      description: If you know the specific commit that has the issue, please provide the commit hash here.
+      placeholder: e.g., a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0
+    validations:
+      required: false
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browsers are you seeing the problem on?
+      multiple: true
+      options:
+        - Chrome
+        - Safari
+        - Firefox
+        - Microsoft Edge
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+
+  - type: markdown
+    attributes:
+      value: |
+        By submitting this issue, you agree to follow the [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct).
diff --git a/.github/ISSUE_TEMPLATE/feature-template.yaml b/.github/ISSUE_TEMPLATE/feature-template.yaml
new file mode 100644
index 00000000000..f88d85b0f67
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-template.yaml
@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Feature Request
+description: Suggest a new feature or improvement.
+labels: ["triage"]
+type: "Feature"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for suggesting a feature! Please provide as much detail as possible to help us evaluate your idea.
+  
+  - type: textarea
+    id: summary
+    attributes:
+      label: Feature Summary
+      description: Clearly describe what the feature is and the problem it solves.
+      placeholder: Describe your feature idea and what problem it addresses.
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposed Solution or Design
+      description: Explain how you imagine this feature working. Include examples, diagrams, or pseudo-code if relevant.
+      placeholder: Describe your proposed solution or design approach.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: impact
+    attributes:
+      label: Impact / Priority
+      description: How important is this feature?
+      options:
+        - (P0)Critical – blocks existing use cases
+        - (P1)High – significantly improves user experience
+        - (P2)Medium – useful enhancement
+        - (P3)Low – nice to have
+      default: 2
+    validations:
+      required: true
+
+  - type: dropdown
+    id: affected-area
+    attributes:
+      label: Affected Area
+      description: Which part of the system does this feature relate to?
+      multiple: true
+      options:
+        - Workflow Engine (Amber)
+        - Workflow UI
+        - Hub
+        - Storage / Metadata
+        - Deployment / Infrastructure
+        - Other
+
+  - type: markdown
+    attributes:
+      value: |
+        By submitting this issue, you agree to follow the [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct).
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/task-template.yaml b/.github/ISSUE_TEMPLATE/task-template.yaml
new file mode 100644
index 00000000000..1e299fef7c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task-template.yaml
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Task
+description: Create a new development or maintenance task.
+labels: ["triage"]
+type: "Task"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a task! Please describe what needs to be done and why.
+
+  - type: textarea
+    id: task-summary
+    attributes:
+      label: Task Summary
+      description: Briefly describe what needs to be done, try to do a single step in a task.
+      placeholder: Example — Refactor workflow scheduler module for better modularity.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Priority
+      description: How urgent or important is this task?
+      options:
+        - P0 – Critical
+        - P1 – High
+        - P2 – Medium
+        - P3 – Low
+      default: 2
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Task Type
+      description: Select the type of work involved.
+      options:
+        - label: Code Implementation
+        - label: Documentation
+        - label: Refactor / Cleanup
+        - label: Testing / QA
+        - label: DevOps / Deployment
+
+  - type: markdown
+    attributes:
+      value: |
+        By submitting this issue, you agree to follow the [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct).
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 00000000000..41287564ff3
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,53 @@
+<!--
+Thanks for sending a pull request (PR)! Here are some tips for you:
+  1. If this is your first time, please read our contributor guidelines: 
+     [Contributing to Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md)
+  2. Ensure you have added or run the appropriate tests for your PR
+  3. If the PR is work in progress, mark it a draft on GitHub.
+  4. Please write your PR title to summarize what this PR proposes, we 
+    are following Conventional Commits style for PR titles as well.
+  5. Be sure to keep the PR description updated to reflect all changes.
+-->
+
+### What changes were proposed in this PR?
+<!--
+Please clarify what changes you are proposing. The purpose of this section 
+is to outline the changes. Here are some tips for you:
+  1. If you propose a new API, clarify the use case for a new API.
+  2. If you fix a bug, you can clarify why it is a bug.
+  3. If it is a refactoring, clarify what has been changed.
+  3. It would be helpful to include a before-and-after comparison using 
+     screenshots or GIFs.
+  4. Please consider writing useful notes for better and faster reviews.
+-->
+
+
+### Any related issues, documentation, discussions?
+<!--
+Please use this section to link other resources if not mentioned already.
+  1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves #1234`
+     or `Closes #1234`. If it is only related, simply mention the issue number.
+  2. If there is design documentation, please add the link.
+  3. If there is a discussion in the mailing list, please add the link.
+-->
+
+
+### How was this PR tested?
+<!--
+If tests were added, say they were added here. Or simply mention that if the PR 
+is tested with existing test cases.  Make sure to include/update test cases that
+check the changes thoroughly including negative and positive cases if possible.
+If it was tested in a way different from regular unit tests, please clarify how
+you tested step by step, ideally copy and paste-able, so that other reviewers can
+test and check, and descendants can verify in the future. If tests were not added, 
+please describe why they were not added and/or why it was difficult to add. 
+-->
+
+
+### Was this PR authored or co-authored using generative AI tooling?
+<!--
+If generative AI tooling has been used in the process of authoring this PR, 
+please include the phrase: 'Generated-by: ' followed by the name of the tool 
+and its version. If no, write 'No'. 
+Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
+-->
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 9d3d7a68fa2..72ff0ffd4a0 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -14,30 +14,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-gui:
+frontend:
   - changed-files:
       - any-glob-to-any-file:
-          - 'core/gui/**'
+          - 'frontend/**'
 
-backend:
-  - all:
-      - changed-files:
-          - any-glob-to-any-file:
-              - 'core/**'
-          - all-globs-to-all-files:
-              - '!core/gui/**'
-              - '!core/log/**'
-              - '!core/scripts/**'
+common:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'common/**'
+
+service:
+  - changed-files:
+      - any-glob-to-any-file:
+          - '*-service/**'
 
 engine:
   - changed-files:
       - any-glob-to-any-file:
-          - 'core/amber/**'
+          - 'amber/**'
 
 python:
   - changed-files:
       - any-glob-to-any-file:
-          - 'core/amber/src/main/python/**'
+          - 'amber/src/main/python/**'
           - '**/*.py'
 
 docs:
@@ -56,7 +56,7 @@ ci:
 build:
   - changed-files:
       - any-glob-to-any-file:
-          - 'core/scripts/**'
+          - 'bin/**'
           - 'deployment/**'
 
 dependencies:
@@ -74,8 +74,8 @@ ddl-change:
 
 feature:
   - head-branch:
-    - '^feat'
-    - 'feature'
+      - '^feat'
+      - 'feature'
 
 fix:
   - head-branch: '^fix'
diff --git a/.github/release/vote-email-template.md b/.github/release/vote-email-template.md
new file mode 100644
index 00000000000..8fd6cd471f5
--- /dev/null
+++ b/.github/release/vote-email-template.md
@@ -0,0 +1,85 @@
+Subject: [VOTE] Release Apache Texera (incubating) ${VERSION} RC${RC_NUM}
+
+Hi Texera Community,
+
+This is a call for vote to release Apache Texera (incubating) ${VERSION}.
+
+== Release Candidate Artifacts ==
+
+The release candidate artifacts can be found at:
+https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/
+
+The artifacts include:
+- apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz (source tarball)
+- apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.asc (GPG signature)
+- apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.sha512 (SHA512 checksum)
+
+== Git Tag ==
+
+The Git tag for this release candidate:
+https://github.com/apache/incubator-texera/releases/tag/${TAG_NAME}
+
+The commit hash for this tag:
+${COMMIT_HASH}
+
+== Release Notes ==
+
+Release notes can be found at:
+https://github.com/apache/incubator-texera/releases/tag/${TAG_NAME}
+
+== Keys ==
+
+The artifacts have been signed with Key [${GPG_KEY_ID}], corresponding to [${GPG_EMAIL}].
+
+The KEYS file containing the public keys can be found at:
+https://dist.apache.org/repos/dist/dev/incubator/texera/KEYS
+
+== How to Verify ==
+
+1. Download the release artifacts:
+
+   wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz
+   wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.asc
+   wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.sha512
+
+2. Import the KEYS file and verify the GPG signature:
+
+   wget https://dist.apache.org/repos/dist/dev/incubator/texera/KEYS
+   gpg --import KEYS
+   gpg --verify apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.asc apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz
+
+3. Verify the SHA512 checksum:
+
+   sha512sum -c apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.sha512
+
+4. Extract and build from source:
+
+   tar -xzf apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz
+   cd apache-texera-${VERSION}-rc${RC_NUM}-src
+   # Follow build instructions in README
+
+== How to Vote ==
+
+The vote will be open for at least 72 hours.
+
+Please vote accordingly:
+
+[ ] +1 Approve the release
+[ ]  0 No opinion
+[ ] -1 Disapprove the release (please provide the reason)
+
+== Checklist for Reference ==
+
+When reviewing, please check:
+
+[ ] Download links are valid
+[ ] Checksums and PGP signatures are valid
+[ ] LICENSE and NOTICE files are correct
+[ ] All files have ASF license headers where appropriate
+[ ] No unexpected binary files
+[ ] Source tarball matches the Git tag
+[ ] Can compile from source successfully
+
+Thanks,
+[Your Name]
+Apache Texera (incubating) PPMC
diff --git a/.github/workflows/build-and-push-images.yml b/.github/workflows/build-and-push-images.yml
new file mode 100644
index 00000000000..478ce28ad2e
--- /dev/null
+++ b/.github/workflows/build-and-push-images.yml
@@ -0,0 +1,513 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Build and push images
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to checkout and build from'
+        required: false
+        default: 'main'
+        type: string
+      image_tag:
+        description: 'Docker image tag to use (e.g., latest, v1.0.0)'
+        required: true
+        default: 'latest'
+        type: string
+      docker_registry:
+        description: 'Docker registry namespace (e.g., apache, myorg)'
+        required: false
+        default: 'apache'
+        type: string
+      services:
+        description: 'Services to build (comma-separated, "*" for all)'
+        required: false
+        default: '*'
+        type: string
+      platforms:
+        description: 'Target platforms to build'
+        required: false
+        default: 'both'
+        type: choice
+        options:
+          - both
+          - amd64
+          - arm64
+  schedule:
+    # Run nightly at 2:00 AM UTC
+    - cron: '0 2 * * *'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.image_tag || 'nightly' }}
+  cancel-in-progress: false
+
+env:
+  DOCKER_REGISTRY: apache  # Will be overridden by job-level env if needed
+
+jobs:
+  # Step 0: Set runtime parameters (handles both manual and scheduled runs)
+  set-parameters:
+    runs-on: ubuntu-latest
+    outputs:
+      branch: ${{ steps.set-params.outputs.branch }}
+      image_tag: ${{ steps.set-params.outputs.image_tag }}
+      docker_registry: ${{ steps.set-params.outputs.docker_registry }}
+      services: ${{ steps.set-params.outputs.services }}
+      platforms: ${{ steps.set-params.outputs.platforms }}
+    steps:
+      - name: Set build parameters
+        id: set-params
+        run: |
+          # Detect if this is a scheduled run
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "Nightly build detected - using nightly defaults"
+            echo "branch=main" >> $GITHUB_OUTPUT
+            echo "image_tag=nightly" >> $GITHUB_OUTPUT
+            echo "docker_registry=apache" >> $GITHUB_OUTPUT
+            echo "services=*" >> $GITHUB_OUTPUT
+            echo "platforms=both" >> $GITHUB_OUTPUT
+          else
+            echo "Manual workflow_dispatch - using user inputs"
+            echo "branch=${{ github.event.inputs.branch || 'main' }}" >> $GITHUB_OUTPUT
+            echo "image_tag=${{ github.event.inputs.image_tag }}" >> $GITHUB_OUTPUT
+            echo "docker_registry=${{ github.event.inputs.docker_registry || 'apache' }}" >> $GITHUB_OUTPUT
+            echo "services=${{ github.event.inputs.services || '*' }}" >> $GITHUB_OUTPUT
+            echo "platforms=${{ github.event.inputs.platforms || 'both' }}" >> $GITHUB_OUTPUT
+          fi
+
+  # Step 1: Generate JOOQ code once and share it
+  generate-jooq:
+    needs: [set-parameters]
+    runs-on: ubuntu-latest
+    env:
+      JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+
+    steps:
+      - name: Checkout Texera
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ needs.set-parameters.outputs.branch }}
+
+      - name: Setup JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
+
+      - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9
+        with:
+          extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]'
+
+      - name: Install PostgreSQL
+        run: sudo apt-get update && sudo apt-get install -y postgresql
+
+      - name: Start PostgreSQL Service
+        run: sudo systemctl start postgresql
+
+      - name: Configure PostgreSQL authentication
+        run: |
+          sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
+          sudo sed -i 's/local   all             postgres                                peer/local   all             postgres                                md5/' /etc/postgresql/*/main/pg_hba.conf
+          sudo sed -i 's/host    all             all             127.0.0.1\/32            scram-sha-256/host    all             all             127.0.0.1\/32            md5/' /etc/postgresql/*/main/pg_hba.conf
+          sudo systemctl restart postgresql
+          sleep 2
+
+      - name: Create Databases
+        run: |
+          PGPASSWORD=postgres psql -h localhost -U postgres -f sql/texera_ddl.sql
+          PGPASSWORD=postgres psql -h localhost -U postgres -f sql/iceberg_postgres_catalog.sql
+          PGPASSWORD=postgres psql -h localhost -U postgres -f sql/texera_lakefs.sql
+
+      - name: Generate JOOQ code
+        run: sbt "DAO/runMain org.apache.texera.dao.JooqCodeGenerator"
+
+      - name: Upload JOOQ generated code
+        uses: actions/upload-artifact@v4
+        with:
+          name: jooq-code
+          path: |
+            common/dao/src/main/scala/org/apache/texera/dao/jooq/generated/
+          retention-days: 1
+
+  # Step 2: Parse services and prepare build matrix
+  prepare-matrix:
+    needs: [set-parameters]
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      build_amd64: ${{ steps.set-platforms.outputs.build_amd64 }}
+      build_arm64: ${{ steps.set-platforms.outputs.build_arm64 }}
+      need_manifest: ${{ steps.set-platforms.outputs.need_manifest }}
+    steps:
+      - name: Checkout Texera
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ needs.set-parameters.outputs.branch }}
+
+      - name: Set target platforms
+        id: set-platforms
+        run: |
+          PLATFORM_INPUT="${{ needs.set-parameters.outputs.platforms }}"
+          
+          case "$PLATFORM_INPUT" in
+            both)
+              echo "build_amd64=true" >> $GITHUB_OUTPUT
+              echo "build_arm64=true" >> $GITHUB_OUTPUT
+              echo "need_manifest=true" >> $GITHUB_OUTPUT
+              echo "Building for both platforms (parallel jobs)"
+              ;;
+            amd64)
+              echo "build_amd64=true" >> $GITHUB_OUTPUT
+              echo "build_arm64=false" >> $GITHUB_OUTPUT
+              echo "need_manifest=false" >> $GITHUB_OUTPUT
+              echo "Building for AMD64 only"
+              ;;
+            arm64)
+              echo "build_amd64=false" >> $GITHUB_OUTPUT
+              echo "build_arm64=true" >> $GITHUB_OUTPUT
+              echo "need_manifest=false" >> $GITHUB_OUTPUT
+              echo "Building for ARM64 only"
+              ;;
+          esac
+
+      - name: Discover and parse services
+        id: set-matrix
+        run: |
+          SERVICES="${{ needs.set-parameters.outputs.services }}"
+
+          # Discover all Dockerfiles in bin/ directory
+          echo "Discovering services from Dockerfiles..."
+          cd bin
+
+          # Standard services from *.dockerfile pattern (excluding postgres17-pgroonga)
+          STANDARD_SERVICES=()
+          for dockerfile in *.dockerfile; do
+            if [[ -f "$dockerfile" ]]; then
+              service_name=$(basename "$dockerfile" .dockerfile)
+              # Skip postgres17-pgroonga
+              if [[ "$service_name" != "postgres17-pgroonga" ]]; then
+                STANDARD_SERVICES+=("$service_name")
+              fi
+            fi
+          done
+
+          # All services are standard services only
+          ALL_SERVICES=("${STANDARD_SERVICES[@]}")
+
+          echo "Found ${#ALL_SERVICES[@]} services: ${ALL_SERVICES[*]}"
+
+          # Filter based on user input
+          if [[ "$SERVICES" == "*" ]]; then
+            SERVICES_LIST=("${ALL_SERVICES[@]}")
+          else
+            IFS=',' read -ra SERVICES_LIST <<< "$SERVICES"
+            # Trim whitespace
+            for i in "${!SERVICES_LIST[@]}"; do
+              SERVICES_LIST[$i]=$(echo "${SERVICES_LIST[$i]}" | xargs)
+            done
+          fi
+
+          # Create JSON matrix with dockerfile info
+          JSON="["
+          FIRST=true
+          for service in "${SERVICES_LIST[@]}"; do
+            # Determine dockerfile path and context
+            if [[ " ${STANDARD_SERVICES[@]} " =~ " ${service} " ]]; then
+              dockerfile="bin/${service}.dockerfile"
+              context="."
+
+              # Map dockerfile service names to Docker image names
+              case "$service" in
+                "texera-web-application")
+                  image_name="texera-dashboard-service"
+                  ;;
+                "computing-unit-master")
+                  image_name="texera-workflow-execution-coordinator"
+                  ;;
+                "computing-unit-worker")
+                  image_name="texera-workflow-execution-runner"
+                  ;;
+                "access-control-service")
+                  image_name="texera-access-control-service"
+                  ;;
+                "config-service")
+                  image_name="texera-config-service"
+                  ;;
+                "file-service")
+                  image_name="texera-file-service"
+                  ;;
+                "workflow-compiling-service")
+                  image_name="texera-workflow-compiling-service"
+                  ;;
+                "workflow-computing-unit-managing-service")
+                  image_name="texera-workflow-computing-unit-managing-service"
+                  ;;
+                *)
+                  # Default: use service name as-is
+                  image_name="$service"
+                  ;;
+              esac
+            else
+              echo "WARNING: Unknown service: $service, skipping"
+              continue
+            fi
+
+            if [[ "$FIRST" == "true" ]]; then
+              FIRST=false
+            else
+              JSON+=","
+            fi
+            JSON+="{\"service\":\"$service\",\"image_name\":\"$image_name\",\"dockerfile\":\"$dockerfile\",\"context\":\"$context\"}"
+          done
+          JSON+="]"
+
+          echo "Generated matrix: $JSON"
+          echo "matrix={\"include\":$JSON}" >> $GITHUB_OUTPUT
+
+  # Step 3a: Build AMD64 images (runs in parallel with ARM64)
+  build-amd64:
+    runs-on: ubuntu-latest
+    needs: [set-parameters, generate-jooq, prepare-matrix]
+    if: needs.prepare-matrix.outputs.build_amd64 == 'true'
+    strategy:
+      matrix: ${{ fromJson(needs.prepare-matrix.outputs.matrix) }}
+      fail-fast: false
+      max-parallel: 8  # Higher parallelism for native builds
+    env:
+      DOCKER_REGISTRY: ${{ needs.set-parameters.outputs.docker_registry }}
+      JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+
+    steps:
+      - name: Checkout Texera
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ needs.set-parameters.outputs.branch }}
+
+      - name: Setup JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
+
+      - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9
+        with:
+          extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]'
+
+      - name: Download JOOQ generated code
+        uses: actions/download-artifact@v4
+        with:
+          name: jooq-code
+          path: common/dao/src/main/scala/org/apache/texera/dao/jooq/generated/
+
+      - name: Free up disk space
+        run: |
+          sudo apt-get clean
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          df -h
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push AMD64 image
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        with:
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
+          platforms: linux/amd64
+          push: true
+          tags: ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:${{ needs.set-parameters.outputs.image_tag }}-amd64
+          cache-from: type=gha,scope=${{ matrix.image_name }}-amd64
+          cache-to: type=gha,mode=max,scope=${{ matrix.image_name }}-amd64
+          labels: |
+            org.opencontainers.image.title=${{ matrix.image_name }}
+            org.opencontainers.image.description=Apache Texera ${{ matrix.image_name }} (AMD64)
+            org.opencontainers.image.vendor=Apache Texera
+
+  # Step 3b: Build ARM64 images (runs in parallel with AMD64)
+  build-arm64:
+    runs-on: ubuntu-latest
+    needs: [set-parameters, generate-jooq, prepare-matrix]
+    if: needs.prepare-matrix.outputs.build_arm64 == 'true'
+    strategy:
+      matrix: ${{ fromJson(needs.prepare-matrix.outputs.matrix) }}
+      fail-fast: false
+      max-parallel: 4  # Lower for QEMU builds
+    env:
+      DOCKER_REGISTRY: ${{ needs.set-parameters.outputs.docker_registry }}
+      JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+
+    steps:
+      - name: Checkout Texera
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ needs.set-parameters.outputs.branch }}
+
+      - name: Setup JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
+
+      - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9
+        with:
+          extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]'
+
+      - name: Download JOOQ generated code
+        uses: actions/download-artifact@v4
+        with:
+          name: jooq-code
+          path: common/dao/src/main/scala/org/apache/texera/dao/jooq/generated/
+
+      - name: Free up disk space
+        run: |
+          sudo apt-get clean
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          df -h
+
+      # Set up QEMU for ARM64 emulation
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+        with:
+          platforms: linux/arm64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push ARM64 image
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        with:
+          context: ${{ matrix.context }}
+          file: ${{ matrix.dockerfile }}
+          platforms: linux/arm64
+          push: true
+          tags: ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:${{ needs.set-parameters.outputs.image_tag }}-arm64
+          cache-from: type=gha,scope=${{ matrix.image_name }}-arm64
+          cache-to: type=gha,mode=max,scope=${{ matrix.image_name }}-arm64
+          labels: |
+            org.opencontainers.image.title=${{ matrix.image_name }}
+            org.opencontainers.image.description=Apache Texera ${{ matrix.image_name }} (ARM64)
+            org.opencontainers.image.vendor=Apache Texera
+
+  # Step 4: Create multi-arch manifests (only if building both platforms)
+  create-manifests:
+    runs-on: ubuntu-latest
+    needs: [set-parameters, prepare-matrix, build-amd64, build-arm64]
+    if: always() && needs.prepare-matrix.outputs.need_manifest == 'true'
+    strategy:
+      matrix: ${{ fromJson(needs.prepare-matrix.outputs.matrix) }}
+      fail-fast: false
+    env:
+      DOCKER_REGISTRY: ${{ needs.set-parameters.outputs.docker_registry }}
+
+    steps:
+      - name: Log in to Docker Hub
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Create and push multi-arch manifest
+        run: |
+          # Create manifest list combining both architectures
+          docker buildx imagetools create -t \
+            ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:${{ needs.set-parameters.outputs.image_tag }} \
+            ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:${{ needs.set-parameters.outputs.image_tag }}-amd64 \
+            ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:${{ needs.set-parameters.outputs.image_tag }}-arm64
+
+          # Also tag as 'latest' if requested
+          if [[ "${{ needs.set-parameters.outputs.image_tag }}" == "latest" ]]; then
+            docker buildx imagetools create -t \
+              ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:latest \
+              ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:latest-amd64 \
+              ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:latest-arm64
+          fi
+
+      - name: Inspect multi-arch manifest
+        run: |
+          docker buildx imagetools inspect ${{ env.DOCKER_REGISTRY }}/${{ matrix.image_name }}:${{ needs.set-parameters.outputs.image_tag }}
+
+  # Step 5: Summary report
+  build-summary:
+    runs-on: ubuntu-latest
+    needs: [set-parameters, prepare-matrix, build-amd64, build-arm64, create-manifests]
+    if: always()
+    steps:
+      - name: Generate build summary
+        run: |
+          echo "# Texera Multi-Arch Build Complete (Parallel)" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "## Build Configuration" >> $GITHUB_STEP_SUMMARY
+          echo "- **Trigger:** ${{ github.event_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Branch:** \`${{ needs.set-parameters.outputs.branch }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- **Registry:** \`${{ needs.set-parameters.outputs.docker_registry }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- **Tag:** \`${{ needs.set-parameters.outputs.image_tag }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- **Services:** ${{ needs.set-parameters.outputs.services }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Platforms:** ${{ needs.set-parameters.outputs.platforms }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "## Build Method" >> $GITHUB_STEP_SUMMARY
+          echo "**Parallel platform builds** (faster)" >> $GITHUB_STEP_SUMMARY
+          echo "- AMD64: Native build on \`ubuntu-latest\`" >> $GITHUB_STEP_SUMMARY
+          echo "- ARM64: QEMU emulation on \`ubuntu-latest\` (runs in parallel)" >> $GITHUB_STEP_SUMMARY
+          echo "- Manifests: Combined into multi-arch images" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "> **Performance:** AMD64 and ARM64 now build simultaneously instead of sequentially!" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "## Images Published" >> $GITHUB_STEP_SUMMARY
+          echo "All images are now available as multi-arch manifests at:" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull ${{ needs.set-parameters.outputs.docker_registry }}/<service-name>:${{ needs.set-parameters.outputs.image_tag }}" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Usage" >> $GITHUB_STEP_SUMMARY
+          echo "The images will automatically use the correct architecture:" >> $GITHUB_STEP_SUMMARY
+          echo "- On x86_64/AMD64: pulls linux/amd64 variant" >> $GITHUB_STEP_SUMMARY
+          echo "- On ARM64/M1/M2: pulls linux/arm64 variant" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Build Status" >> $GITHUB_STEP_SUMMARY
+          echo "- AMD64 builds: ${{ needs.build-amd64.result }}" >> $GITHUB_STEP_SUMMARY
+          echo "- ARM64 builds: ${{ needs.build-arm64.result }}" >> $GITHUB_STEP_SUMMARY
+          echo "- Manifest creation: ${{ needs.create-manifests.result }}" >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
diff --git a/.github/workflows/check-header.yml b/.github/workflows/check-header.yml
index 0f781236e9e..c2cbddc1333 100644
--- a/.github/workflows/check-header.yml
+++ b/.github/workflows/check-header.yml
@@ -30,4 +30,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: apache/skywalking-eyes@v0.7.0
+      - uses: apache/skywalking-eyes@5c5b974209f0de5d905f37deb69369068ebfc15c # v0.7.0
diff --git a/.github/workflows/create-release-candidate.yml b/.github/workflows/create-release-candidate.yml
new file mode 100644
index 00000000000..719dc10f586
--- /dev/null
+++ b/.github/workflows/create-release-candidate.yml
@@ -0,0 +1,340 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Create and upload release candidate artifacts
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Existing Git tag (e.g., v1.1.0-incubating-rc1)'
+        required: true
+        type: string
+      rc_number:
+        description: 'Release candidate number for artifacts (e.g., 1 for RC1, 2 for RC2)'
+        required: true
+        type: string
+        default: '1'
+
+jobs:
+  create-rc:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.vars.outputs.version }}
+      rc_num: ${{ steps.vars.outputs.rc_num }}
+      tag_name: ${{ steps.vars.outputs.tag_name }}
+      rc_dir: ${{ steps.vars.outputs.rc_dir }}
+      tarball_name: ${{ steps.vars.outputs.tarball_name }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history for proper tagging
+
+      - name: Validate tag exists
+        run: |
+          TAG_NAME="${{ github.event.inputs.tag }}"
+
+          # Check if tag exists
+          if ! git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
+            echo "Error: Tag '$TAG_NAME' does not exist"
+            echo "Available tags:"
+            git tag -l | tail -10
+            exit 1
+          fi
+
+          echo "✓ Tag validation passed: $TAG_NAME"
+
+      - name: Set up variables
+        id: vars
+        run: |
+          TAG_NAME="${{ github.event.inputs.tag }}"
+          RC_NUM="${{ github.event.inputs.rc_number }}"
+
+          # Parse version from tag (format: v1.1.0-incubating or v1.1.0-incubating-rcN)
+          # Both formats are accepted, but we use the input rc_number for artifacts
+          if [[ "$TAG_NAME" =~ ^v([0-9]+\.[0-9]+\.[0-9]+-incubating)(-rc[0-9]+)?$ ]]; then
+            VERSION="${BASH_REMATCH[1]}"
+          else
+            echo "Error: Tag must be in format vX.Y.Z-incubating or vX.Y.Z-incubating-rcN (e.g., v1.1.0-incubating-rc1)"
+            exit 1
+          fi
+
+          RC_DIR="${VERSION}-RC${RC_NUM}"
+          TARBALL_NAME="apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz"
+
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "rc_num=$RC_NUM" >> $GITHUB_OUTPUT
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+          echo "rc_dir=$RC_DIR" >> $GITHUB_OUTPUT
+          echo "tarball_name=$TARBALL_NAME" >> $GITHUB_OUTPUT
+
+          echo "Release Candidate: $TAG_NAME"
+          echo "Version: $VERSION"
+          echo "RC Number: $RC_NUM"
+          echo "Tarball: $TARBALL_NAME"
+          echo "Staging directory: dist/dev/incubator/texera/$RC_DIR"
+
+      - name: Create source tarball
+        run: |
+          TAG_NAME="${{ steps.vars.outputs.tag_name }}"
+          TARBALL_NAME="${{ steps.vars.outputs.tarball_name }}"
+          VERSION="${{ steps.vars.outputs.version }}"
+          RC_NUM="${{ steps.vars.outputs.rc_num }}"
+
+          # Create a temporary directory for the archive
+          TEMP_DIR=$(mktemp -d)
+          ARCHIVE_DIR="$TEMP_DIR/apache-texera-${VERSION}-rc${RC_NUM}-src"
+
+          echo "Creating source archive in $ARCHIVE_DIR"
+
+          # Export the git repository at the tag
+          git archive --format=tar --prefix="apache-texera-${VERSION}-rc${RC_NUM}-src/" "$TAG_NAME" | tar -x -C "$TEMP_DIR"
+
+          # Create tarball
+          cd "$TEMP_DIR"
+          tar -czf "$GITHUB_WORKSPACE/$TARBALL_NAME" "apache-texera-${VERSION}-rc${RC_NUM}-src"
+
+          cd "$GITHUB_WORKSPACE"
+
+          # Verify tarball was created
+          if [[ ! -f "$TARBALL_NAME" ]]; then
+            echo "Error: Tarball was not created"
+            exit 1
+          fi
+
+          # Show tarball info
+          ls -lh "$TARBALL_NAME"
+          echo "✓ Created tarball: $TARBALL_NAME"
+
+      - name: Import GPG key
+        run: |
+          echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --batch --import
+
+          # List imported keys
+          gpg --list-secret-keys
+
+          echo "✓ GPG key imported successfully"
+
+      - name: Create GPG signature (.asc)
+        run: |
+          TARBALL_NAME="${{ steps.vars.outputs.tarball_name }}"
+
+          # Sign the tarball
+          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 \
+            --armor --detach-sign --output "${TARBALL_NAME}.asc" "$TARBALL_NAME"
+
+          # Verify signature
+          gpg --verify "${TARBALL_NAME}.asc" "$TARBALL_NAME"
+
+          echo "✓ Created GPG signature: ${TARBALL_NAME}.asc"
+
+      - name: Create SHA512 checksum
+        run: |
+          TARBALL_NAME="${{ steps.vars.outputs.tarball_name }}"
+
+          # Create SHA512 checksum
+          sha512sum "$TARBALL_NAME" > "${TARBALL_NAME}.sha512"
+
+          # Display checksum
+          cat "${TARBALL_NAME}.sha512"
+
+          echo "✓ Created SHA512 checksum: ${TARBALL_NAME}.sha512"
+
+      - name: Generate vote email template
+        id: vote_email
+        run: |
+          VERSION="${{ steps.vars.outputs.version }}"
+          RC_NUM="${{ steps.vars.outputs.rc_num }}"
+          TAG_NAME="${{ steps.vars.outputs.tag_name }}"
+          RC_DIR="${{ steps.vars.outputs.rc_dir }}"
+
+          # Get commit hash for the tag
+          COMMIT_HASH=$(git rev-parse "$TAG_NAME")
+
+          # Get GPG key ID from the imported key
+          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep 'sec' | head -n1 | awk '{print $2}' | cut -d'/' -f2)
+          GPG_EMAIL=$(gpg --list-secret-keys | grep 'uid' | head -n1 | grep -oP '[\w\.-]+@[\w\.-]+')
+
+          # Copy template from repository
+          cp .github/release/vote-email-template.md vote-email.txt
+
+          # Substitute variables in the template
+          sed -i "s/\${VERSION}/${VERSION}/g" vote-email.txt
+          sed -i "s/\${RC_NUM}/${RC_NUM}/g" vote-email.txt
+          sed -i "s/\${RC_DIR}/${RC_DIR}/g" vote-email.txt
+          sed -i "s/\${TAG_NAME}/${TAG_NAME}/g" vote-email.txt
+          sed -i "s/\${COMMIT_HASH}/${COMMIT_HASH}/g" vote-email.txt
+          sed -i "s/\${GPG_KEY_ID}/${GPG_KEY_ID}/g" vote-email.txt
+          sed -i "s/\${GPG_EMAIL}/${GPG_EMAIL}/g" vote-email.txt
+
+          echo "✓ Vote email template generated!"
+
+      - name: Upload RC artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: rc-artifacts
+          path: |
+            ${{ steps.vars.outputs.tarball_name }}
+            ${{ steps.vars.outputs.tarball_name }}.asc
+            ${{ steps.vars.outputs.tarball_name }}.sha512
+            vote-email.txt
+          retention-days: 7
+
+  upload-rc:
+    runs-on: ubuntu-latest
+    needs: create-rc
+
+    steps:
+      - name: Download RC artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: rc-artifacts
+
+      - name: Verify downloaded artifacts
+        run: |
+          TARBALL_NAME="${{ needs.create-rc.outputs.tarball_name }}"
+          echo "Verifying downloaded artifacts..."
+          ls -lh
+
+          if [[ ! -f "$TARBALL_NAME" ]] || [[ ! -f "${TARBALL_NAME}.asc" ]] || [[ ! -f "${TARBALL_NAME}.sha512" ]]; then
+            echo "Error: Missing required artifacts"
+            exit 1
+          fi
+
+          echo "✓ All artifacts downloaded successfully"
+
+      - name: Install SVN
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y subversion
+          svn --version
+
+      - name: Checkout SVN dev directory
+        run: |
+          RC_DIR="${{ needs.create-rc.outputs.rc_dir }}"
+
+          # Checkout the dev directory with depth=empty (lightweight)
+          svn co --depth=empty https://dist.apache.org/repos/dist/dev/incubator/texera svn-texera \
+            --username "${{ secrets.SVN_USERNAME }}" \
+            --password "${{ secrets.SVN_PASSWORD }}" \
+            --no-auth-cache
+
+          cd svn-texera
+
+          # Create RC directory if it doesn't exist
+          if ! svn info "$RC_DIR" >/dev/null 2>&1; then
+            mkdir -p "$RC_DIR"
+            svn add "$RC_DIR"
+            echo "✓ Created new RC directory: $RC_DIR"
+          else
+            svn update "$RC_DIR"
+            echo "✓ RC directory already exists: $RC_DIR"
+          fi
+
+      - name: Stage artifacts to SVN
+        run: |
+          TARBALL_NAME="${{ needs.create-rc.outputs.tarball_name }}"
+          RC_DIR="${{ needs.create-rc.outputs.rc_dir }}"
+
+          cd svn-texera/"$RC_DIR"
+
+          # Copy artifacts
+          cp "$GITHUB_WORKSPACE/$TARBALL_NAME" .
+          cp "$GITHUB_WORKSPACE/${TARBALL_NAME}.asc" .
+          cp "$GITHUB_WORKSPACE/${TARBALL_NAME}.sha512" .
+
+          # Add files to SVN
+          svn add "$TARBALL_NAME" "${TARBALL_NAME}.asc" "${TARBALL_NAME}.sha512" --force
+
+          # Check status
+          svn status
+
+          echo "✓ Staged artifacts to SVN"
+
+      - name: Commit artifacts to dist/dev
+        run: |
+          VERSION="${{ needs.create-rc.outputs.version }}"
+          RC_NUM="${{ needs.create-rc.outputs.rc_num }}"
+          RC_DIR="${{ needs.create-rc.outputs.rc_dir }}"
+
+          cd svn-texera
+
+          # Commit with descriptive message
+          svn commit -m "Add Apache Texera ${VERSION} RC${RC_NUM} artifacts" \
+            --username "${{ secrets.SVN_USERNAME }}" \
+            --password "${{ secrets.SVN_PASSWORD }}" \
+            --no-auth-cache
+
+          echo "✓ Committed artifacts to dist/dev/incubator/texera/$RC_DIR"
+
+      - name: Generate release summary
+        run: |
+          VERSION="${{ needs.create-rc.outputs.version }}"
+          RC_NUM="${{ needs.create-rc.outputs.rc_num }}"
+          TAG_NAME="${{ needs.create-rc.outputs.tag_name }}"
+          RC_DIR="${{ needs.create-rc.outputs.rc_dir }}"
+          TARBALL_NAME="${{ needs.create-rc.outputs.tarball_name }}"
+
+          echo "## Release Candidate Created Successfully! 🎉" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Release Information" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version:** ${VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "- **RC Number:** RC${RC_NUM}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Git Tag:** \`${TAG_NAME}\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Artifacts Location" >> $GITHUB_STEP_SUMMARY
+          echo "📦 **Staging Directory:** https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Artifacts Created" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${TARBALL_NAME}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${TARBALL_NAME}.asc\` (GPG signature)" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${TARBALL_NAME}.sha512\` (SHA512 checksum)" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Next Steps" >> $GITHUB_STEP_SUMMARY
+          echo "1. Verify the artifacts at the staging directory" >> $GITHUB_STEP_SUMMARY
+          echo "2. Send [VOTE] email to dev@texera.apache.org" >> $GITHUB_STEP_SUMMARY
+          echo "3. Include links to:" >> $GITHUB_STEP_SUMMARY
+          echo "   - Tag: https://github.com/${{ github.repository }}/releases/tag/${TAG_NAME}" >> $GITHUB_STEP_SUMMARY
+          echo "   - Artifacts: https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Verification Commands" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
+          echo "# Download and verify signature" >> $GITHUB_STEP_SUMMARY
+          echo "wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/${TARBALL_NAME}" >> $GITHUB_STEP_SUMMARY
+          echo "wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/${TARBALL_NAME}.asc" >> $GITHUB_STEP_SUMMARY
+          echo "wget https://dist.apache.org/repos/dist/release/incubator/texera/KEYS" >> $GITHUB_STEP_SUMMARY
+          echo "gpg --import KEYS" >> $GITHUB_STEP_SUMMARY
+          echo "gpg --verify ${TARBALL_NAME}.asc ${TARBALL_NAME}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "# Verify SHA512" >> $GITHUB_STEP_SUMMARY
+          echo "wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/${TARBALL_NAME}.sha512" >> $GITHUB_STEP_SUMMARY
+          echo "sha512sum -c ${TARBALL_NAME}.sha512" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+
+          echo "✓ Release candidate workflow completed successfully!"
+
+      - name: Display vote email template
+        run: |
+          echo "## 📧 Vote Email Template" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Copy the content below to send to dev@texera.apache.org:" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          cat "$GITHUB_WORKSPACE/vote-email.txt" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/github-action-build.yml b/.github/workflows/github-action-build.yml
index 14df23456a4..4c79fdce800 100644
--- a/.github/workflows/github-action-build.yml
+++ b/.github/workflows/github-action-build.yml
@@ -17,6 +17,9 @@
 
 name: Build
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+  
 on:
   push:
     branches:
@@ -30,7 +33,7 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
-  gui:
+  frontend:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -55,22 +58,22 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: |
-            core/gui/node_modules
+            frontend/node_modules
           key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.node-version }}-yarn-cache-v1-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.node-version }}-yarn-cache-v1-
       - name: Prepare Yarn 4.5.1
-        run: corepack enable && corepack prepare yarn@4.5.1 --activate && yarn --cwd core/gui set version 4.5.1
+        run: corepack enable && corepack prepare yarn@4.5.1 --activate && yarn --cwd frontend set version 4.5.1
       - name: Install dependency
-        run: yarn --cwd core/gui install --immutable --network-timeout=100000
+        run: yarn --cwd frontend install --immutable --network-timeout=100000
       - name: Lint with Prettier & ESLint
-        run: yarn --cwd core/gui format:ci
+        run: yarn --cwd frontend format:ci
       - name: Run frontend unit tests
-        run: yarn --cwd core/gui run test:ci
+        run: yarn --cwd frontend run test:ci
       - name: Prod build
-        run: yarn --cwd core/gui run build:ci
+        run: yarn --cwd frontend run build:ci
 
-  core:
+  scala:
     strategy:
       matrix:
         os: [ ubuntu-22.04 ]
@@ -102,26 +105,33 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Setup sbt launcher
-        uses: sbt/setup-sbt@v1
-      - uses: coursier/cache-action@v6
+        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
+      - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9
         with:
-          extraSbtFiles: '["core/*.sbt", "core/project/**.{scala,sbt}", "core/project/build.properties" ]'
+          extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]'
       - name: Lint with scalafmt
-        run: cd core && sbt scalafmtCheckAll
-      - name: Create Database
-        run: psql -h localhost -U postgres -f deployment/k8s/texera-helmchart/files/texera_ddl.sql
+        run: sbt scalafmtCheckAll
+      - name: Create Databases
+        run: |
+          psql -h localhost -U postgres -f sql/texera_ddl.sql
+          psql -h localhost -U postgres -f sql/iceberg_postgres_catalog.sql
+          psql -h localhost -U postgres -f sql/texera_lakefs.sql
+        env:
+          PGPASSWORD: postgres
+      - name: Create texera_db_for_test_cases
+        run: psql -h localhost -U postgres -v DB_NAME=texera_db_for_test_cases -f sql/texera_ddl.sql
         env:
           PGPASSWORD: postgres
       - name: Compile with sbt
-        run: cd core && sbt clean package
+        run: sbt clean package
       - name: Run backend tests
-        run: cd core && sbt test
+        run: sbt test
 
-  python_udf:
+  python:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.10', '3.11', '3.12' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Texera
@@ -133,18 +143,18 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          if [ -f core/amber/requirements.txt ]; then pip install -r core/amber/requirements.txt; fi
-          if [ -f core/amber/operator-requirements.txt ]; then pip install -r core/amber/operator-requirements.txt; fi
+          if [ -f amber/requirements.txt ]; then pip install -r amber/requirements.txt; fi
+          if [ -f amber/operator-requirements.txt ]; then pip install -r amber/operator-requirements.txt; fi
       - name: Install PostgreSQL
         run: sudo apt-get update && sudo apt-get install -y postgresql
       - name: Start PostgreSQL Service
         run: sudo systemctl start postgresql
       - name: Create Database and User
         run: |
-          cd core/scripts/sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql
-      - name: Lint with flake8 and black
+          cd sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql
+      - name: Lint with Ruff
         run: |
-          cd core/amber/src/main/python && flake8 && black . --check
+          cd amber/src/main/python && ruff check . && ruff format --check .
       - name: Test with pytest
         run: |
-          cd core/amber/src/main/python && pytest -sv --ignore=core/models/test_RTableExecutor.py
+          cd amber/src/main/python && pytest -sv
diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml
new file mode 100644
index 00000000000..0846b98ebe8
--- /dev/null
+++ b/.github/workflows/issue-triage.yml
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Issue triage
+on:
+  issues:
+    types: [assigned, unassigned]
+
+permissions:
+  issues: write
+  pull-requests: read
+
+jobs:
+  # --------------------------------------------------------
+  # 1) Issue triage: add/remove "triage" on assignment changes
+  # --------------------------------------------------------
+  issue-triage:
+    if: github.event_name == 'issues'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove 'triage' label when issue is assigned
+        if: github.event.action == 'assigned'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { owner, repo } = context.repo;
+            const issue_number = context.payload.issue.number;
+
+            try {
+              await github.rest.issues.removeLabel({
+                owner,
+                repo,
+                issue_number,
+                name: 'triage',
+              });
+              core.info(`Removed 'triage' from issue #${issue_number}`);
+            } catch (e) {
+              if (e.status === 404) {
+                core.info(`Issue #${issue_number} has no 'triage' label, nothing to remove.`);
+              } else {
+                core.warning(`Failed to remove 'triage' from issue #${issue_number}: ${e.message}`);
+                throw e;
+              }
+            }
+
+      - name: Add 'triage' label when issue is unassigned and has no assignees
+        if: github.event.action == 'unassigned'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const issue = context.payload.issue;
+            const { owner, repo } = context.repo;
+            const issue_number = issue.number;
+
+            const assignees = issue.assignees || [];
+            if (assignees.length > 0) {
+              core.info(
+                `Issue #${issue_number} still has ${assignees.length} assignee(s), not adding 'triage'.`
+              );
+              return;
+            }
+
+            core.info(`Issue #${issue_number} has no assignees, adding 'triage' label.`);
+            try {
+              await github.rest.issues.addLabels({
+                owner,
+                repo,
+                issue_number,
+                labels: ['triage'],
+              });
+            } catch (e) {
+              core.warning(`Failed to add 'triage' to issue #${issue_number}: ${e.message}`);
+              throw e;
+            }
diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
index f4151a19047..fcc5d46f0ca 100644
--- a/.github/workflows/lint-pr.yml
+++ b/.github/workflows/lint-pr.yml
@@ -31,6 +31,6 @@ jobs:
     permissions:
       pull-requests: read
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 627c56f0874..62f85f0e2f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,7 +87,7 @@ rebel.xml
 *.log.gz
 
 # Ignoring the entire log folder
-log/
+logs/
 
 # Ignoring package-lock.json
 package-lock.json
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 309f9d844fc..fed8faf136e 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -16,6 +16,7 @@ header:
     - 'NOTICE'
     - '.dockerignore'
     - '.gitattributes'
+    - '.github/PULL_REQUEST_TEMPLATE'
     - 'yarn.lock'
     - '.nvmrc'
     - '.htaccess'
@@ -23,4 +24,5 @@ header:
     - 'site.webmanifest'
     - '.gitignore'
     - '.licenserc.yaml'
-    - 'core/gui/.yarn/**'
+    - 'frontend/.yarn/**'
+    - 'amber/src/main/python/proto/**'
diff --git a/.run/AccessControlService.run.xml b/.run/AccessControlService.run.xml
new file mode 100644
index 00000000000..56ffbc50fbb
--- /dev/null
+++ b/.run/AccessControlService.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="AccessControlService" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.service.AccessControlService" />
+    <module name="texera.access-control-service" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.service.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/ComputingUnitManagingService.run.xml b/.run/ComputingUnitManagingService.run.xml
new file mode 100644
index 00000000000..8bbb5c1966f
--- /dev/null
+++ b/.run/ComputingUnitManagingService.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ComputingUnitManagingService" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.service.ComputingUnitManagingService" />
+    <module name="texera.computing-unit-managing-service" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.service.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/ComputingUnitMaster.run.xml b/.run/ComputingUnitMaster.run.xml
new file mode 100644
index 00000000000..5ffffb79e88
--- /dev/null
+++ b/.run/ComputingUnitMaster.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ComputingUnitMaster" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.web.ComputingUnitMaster" />
+    <module name="texera.amber" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.web.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/ComputingUnitWorker.run.xml b/.run/ComputingUnitWorker.run.xml
new file mode 100644
index 00000000000..854da672287
--- /dev/null
+++ b/.run/ComputingUnitWorker.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ComputingUnitWorker" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.web.ComputingUnitWorker" />
+    <module name="texera.amber" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.web.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/ConfigService.run.xml b/.run/ConfigService.run.xml
new file mode 100644
index 00000000000..395688afca4
--- /dev/null
+++ b/.run/ConfigService.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ConfigService" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.service.ConfigService" />
+    <module name="texera.config-service" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.service.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/FileService.run.xml b/.run/FileService.run.xml
new file mode 100644
index 00000000000..0a54e70aac8
--- /dev/null
+++ b/.run/FileService.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="FileService" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.service.FileService" />
+    <module name="texera.file-service" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.service.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/TexeraWebApplication.run.xml b/.run/TexeraWebApplication.run.xml
new file mode 100644
index 00000000000..d9e3829fc22
--- /dev/null
+++ b/.run/TexeraWebApplication.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TexeraWebApplication" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.web.TexeraWebApplication" />
+    <module name="texera.amber" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.web.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/WorkflowCompilingService.run.xml b/.run/WorkflowCompilingService.run.xml
new file mode 100644
index 00000000000..d41f60d9c54
--- /dev/null
+++ b/.run/WorkflowCompilingService.run.xml
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WorkflowCompilingService" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.apache.texera.service.WorkflowCompilingService" />
+    <module name="texera.workflow-compiling-service" />
+    <shortenClasspath name="ARGS_FILE" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.apache.texera.service.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/frontend.run.xml b/.run/frontend.run.xml
new file mode 100644
index 00000000000..8132f576027
--- /dev/null
+++ b/.run/frontend.run.xml
@@ -0,0 +1,30 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="frontend" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/frontend/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/texera micro services.run.xml b/.run/texera micro services.run.xml
new file mode 100644
index 00000000000..6cdb0a02a56
--- /dev/null
+++ b/.run/texera micro services.run.xml	
@@ -0,0 +1,31 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="texera micro services" type="CompoundRunConfigurationType">
+    <toRun name="AccessControlService" type="Application" />
+    <toRun name="ComputingUnitManagingService" type="Application" />
+    <toRun name="ComputingUnitMaster" type="Application" />
+    <toRun name="ComputingUnitWorker" type="Application" />
+    <toRun name="ConfigService" type="Application" />
+    <toRun name="FileService" type="Application" />
+    <toRun name="TexeraWebApplication" type="Application" />
+    <toRun name="WorkflowCompilingService" type="Application" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/texera-lakefs.run.xml b/.run/texera-lakefs.run.xml
new file mode 100644
index 00000000000..e26ec964fd2
--- /dev/null
+++ b/.run/texera-lakefs.run.xml
@@ -0,0 +1,28 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="texera-lakefs" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="sourceFilePath" value="file-service/src/main/resources/docker-compose.yml" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/core/.scalafix.conf b/.scalafix.conf
similarity index 100%
rename from core/.scalafix.conf
rename to .scalafix.conf
diff --git a/core/.scalafmt.conf b/.scalafmt.conf
similarity index 100%
rename from core/.scalafmt.conf
rename to .scalafmt.conf
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab2b0679eca..f3b0dfdd5e8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,18 +57,18 @@ Do not include any of the following in your PR:
 
 ### Final Steps Before Review
 #### Your PR should pass scalafix check (lint) and scalafmt check. 
-- To check lint, under `core` run command `sbt "scalafixAll --check"`; to fix lint issues, run `sbt scalafixAll`.
-- To check format, under `core` run command `sbt scalafmtCheckAll`; to fix format, run `sbt scalafmtAll`. 
+- To check lint, under the root directory run command `sbt "scalafixAll --check"`; to fix lint issues, run `sbt scalafixAll`.
+- To check format, under the root directory run command `sbt scalafmtCheckAll`; to fix format, run `sbt scalafmtAll`. 
 - When you need to execute both, scalafmt is supposed to be executed after scalafix.
 #### Testing the backend
-1. The test framework is `scalatest`, for the amber engine, tests are located under `core/amber/src/test`; for `WorkflowCompilingService`, tests are located under `core/workflow-compiling-service`. You can find unit tests and e2e tests.
-2. To execute it, navigate to `core` directory in the command line and execute `sbt test`.
+1. The test framework is `scalatest`, for the amber engine, tests are located under `amber/src/test`; for `WorkflowCompilingService`, tests are located under `workflow-compiling-service/src/test`. You can find unit tests and e2e tests.
+2. To execute it, navigate to the root directory in the command line and execute `sbt test`.
 3. If using IntelliJ to execute the test cases please make sure to be at the correct working directory.
-* For the amber engine's tests, the working directory should be `core/amber`
-* For the other services' tests, the working directory should be `core`
+* For the amber engine's tests, the working directory should be `amber`
+* For the other services' tests, the working directory should be the root directory
 #### Testing the frontend 
 Before merging your code to the master branch, you need to pass the existing unit tests first.
-1. Open a command line. Navigate to the `core/gui` directory.
+1. Open a command line. Navigate to the `frontend` directory.
 2. Start the test:
 ```
 ng test --watch=false
diff --git a/Dockerfile b/Dockerfile
index 0c6aef6748f..61dc3049460 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,9 +49,9 @@ WORKDIR /core
 COPY .git ../.git
 COPY --from=nodegui /gui/dist ./gui/dist
 
-RUN scripts/build-services.sh
+RUN ../bin/build-services.sh
 
-CMD ["scripts/deploy-docker.sh"]
+CMD ["../bin/deploy-docker.sh"]
 
 EXPOSE 8080
 
diff --git a/README.md b/README.md
index 2a945275c9c..6f2f92e8188 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Apache Texera - Collaborative Data Science and AI/ML Using Workflows</h1>
 
 <p align="center">
-  <a href="https://texera.io"> <img src="core/gui/src/assets/logos/full_logo_small.png" alt="texera-logo" height="150px"/> </a>
+  <a href="https://texera.io"> <img src="frontend/src/assets/logos/full_logo_small.png" alt="texera-logo" height="150px"/> </a>
   <br>
   <i>Apache Texera (Incubating) supports scalable data computation and enables advanced AI/ML techniques.</i>
   <br>
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..c293b53e971
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,272 @@
+# Security Policy
+
+This document outlines Apache Texera (Incubating)'s security model, deployment considerations, and procedures for
+reporting security vulnerabilities.
+
+## Table of Contents
+
+- [Security Model Overview](#security-model-overview)
+- [Resources in Texera](#resources-in-texera)
+- [User Categories and Responsibilities](#user-categories-and-responsibilities)
+- [UI User Roles and Privileges](#ui-user-roles-and-privileges)
+- [Deployments and Computing Units](#deployments-and-computing-units)
+- [What is NOT a Security Issue](#what-is-not-a-security-issue)
+- [Reporting Security Vulnerabilities](#reporting-security-vulnerabilities)
+
+## Security Model Overview
+
+Texera's security architecture is built around:
+
+1. **Authentication**: JWT-based token authentication with configurable expiration
+2. **Authorization**: Role-based access control (RBAC) with four user roles
+3. **Resource Access Control**: Fine-grained privileges for datasets, workflows, and computing units
+4. **Deployment Isolation**: Separate security considerations for different deployment modes
+
+## Resources in Texera
+
+In Texera, a **resource** is any object within the system that can be created, accessed, modified, or shared by users
+via the web application. Understanding resource types and how access to them is managed is critical to following
+Texera’s security model.
+
+### Resource Types
+
+Texera supports the following resource types:
+
+- **Datasets**: Input data imported or uploaded for workflow processing
+- **Workflows**: Data analytics pipelines defined by users
+- **Computing Units**: Execution environments for running workflows (e.g., Kubernates PODs)
+- **Results**: Output from workflow executions, including but not limited to data, logs, metrics, and visualizations
+
+### Resource Ownership and Access Control
+
+Every resource is owned by a user. The owner controls the resource's visibility and can share it with other users by
+granting access permissions:
+
+- **READ**: View the resource and its contents
+- **WRITE**: Modify, execute, delete, and share the resource
+- **NONE**: No access to the resource
+
+Resources can be shared with specific users or made public. Public resources are visible to all users. Resource owners
+can modify access permissions at any time.
+
+### Resource Visibility
+
+- Users can only see resources for which they have at least READ access.
+- Access changes (e.g., revoking WRITE or READ) take effect immediately for affected users.
+
+## User Categories and Responsibilities
+
+Texera's security model distinguishes between two categories of users with distinct responsibilities:
+
+### Deployment Managers
+
+They have the highest level of access and control. They install and configure Texera, and make decisions about
+technologies, deployment modes, and permissions. They can potentially delete the entire installation and have access to
+all credentials, including database passwords, JWT secrets, and API keys. Deployment managers have full access to:
+
+- The underlying infrastructure (servers, Kubernetes clusters, cloud resources)
+- Database administration (e.g., PostgreSQL)
+- All configuration files, environment variables, and secrets
+- Network and security settings
+- Container orchestration and system logs
+
+Deployment managers can also decide to keep audits, backups, and copies of information outside of Texera, which are not
+covered by Texera's security model. They operate outside the Texera UI role system and may or may not have a UI user
+account.
+
+### UI Users
+
+**Who They Are**: Individuals who interact with Texera through the web interface.
+
+**Access Level**: Application-level access only. UI users work within the Texera platform but do not have access to:
+
+- The underlying infrastructure (servers, Kubernetes cluster)
+- Database administration
+- System configuration files
+- Network and firewall settings
+- Container orchestration
+
+**Roles**: UI users are assigned one of four roles (INACTIVE, RESTRICTED, REGULAR, ADMIN) that control their permissions
+within the Texera application.
+
+**Security Scope**: UI users are responsible for:
+
+- Protecting their login credentials
+- Managing access to their resources, e.g., datasets and workflows
+- Following organizational data security policies
+
+## UI User Roles and Privileges
+
+Texera implements four UI user roles with increasing levels of privilege. These roles control what users can do **within
+the Texera web application** and do not grant infrastructure-level access.
+
+### 1. INACTIVE
+
+Users with this role cannot log in to the system or access any resources. This is the default role for new registrations
+awaiting approval in controlled environments.
+
+### 2. RESTRICTED
+
+Users with this role cannot log in to the system or access any resources. Unlike INACTIVE users, RESTRICTED accounts
+typically represent users who previously used Texera but are now inactive and no longer use it. Any resources they
+created in the past remain in the system but are inaccessible to them. This role is used to preserve historical data
+while preventing further access.
+
+### 3. REGULAR
+
+Users with this role can create and manage their own resources (datasets, workflows, computing units). They have full
+READ and WRITE access to resources they own, and their access to other users' resources is determined by granted
+permissions (see Resources section above).
+
+They cannot:
+
+- Access other users' private resources without granted permissions
+- Manage user accounts or change user roles
+- Access system configuration, logs, or global settings
+
+This is the standard role for data scientists, analysts, and researchers.
+**Note**: REGULAR users can execute arbitrary code within workflows, so this role should only be granted to trusted
+individuals.
+
+### 4. ADMIN
+
+Users with this role are application administrators who manage users and resources through the web interface.
+
+They have all REGULAR privileges, plus:
+
+- Manage all UI user accounts (create, modify, and delete users)
+- Change user roles
+- View user login information.
+- Configure application settings available in the web interface
+
+They cannot:
+
+- Access the underlying servers or Kubernetes cluster
+- Modify JWT secrets or database passwords
+- Configure HTTPS/TLS or network settings
+- Access system-level logs or SSH into servers
+
+**Note**: ADMIN is an application-level role, not an infrastructure administrator. For infrastructure management,
+deployment manager access is required.
+
+## Deployments and Computing Units
+Texera can be deployed in several configurations, such as local development, single-node setups, or distributed Kubernetes 
+clusters. For details on supported deployment options and their operational differences, see the deployment guides in
+our [wiki](https://github.com/apache/texera/wiki/How-to-run-Texera-on-local-Kubernetes).
+
+### Computing Unit Types
+
+Texera executes workflows on **computing units**. UI users (REGULAR and ADMIN) can execute arbitrary code (e.g., through
+UDFs written in Python, R, Scala) within computing units as part of their workflows. This code is currently not
+sandboxed or restricted by Texera. Deployment managers configure which types of computing units are available:
+
+#### Local Computing Units
+
+Local computing units run as processes on the same machine as the Texera services (single-node deployment).
+
+**Security characteristics**:
+
+- Suitable for development, testing, and small team use
+- All computing units share the same host machine
+- No infrastructure-level isolation between users' workflows
+- Deployment managers control all computing resources
+
+**Security considerations**:
+
+- Users' workflow code executes on the host machine with limited isolation
+- Deployment managers must trust all REGULAR and ADMIN users
+- Resource exhaustion by one user can affect all users
+
+#### Kubernetes Computing Units
+
+Kubernetes computing units run as separate PODs in a Kubernetes cluster. Each computing unit is dynamically created when
+a user needs it.
+
+**Security characteristics**:
+
+- Suitable for production environments and multi-tenant deployments
+- Each computing unit runs in an isolated Kubernetes pod
+- UI users configure resource limits (CPU, memory, GPU) per pod
+- Pods can be scheduled across multiple nodes for better resource distribution
+
+**Security considerations**:
+
+- Better isolation between users compared to local computing units
+- Kubernetes provides namespace and pod-level isolation
+- Resource limits prevent individual users from consuming excessive resources
+- Container security and image scanning should be implemented
+- Deployment managers must secure the Kubernetes cluster infrastructure
+
+### What is NOT Guaranteed
+
+Texera's security model does NOT guarantee:
+
+- Protection against malicious code in user workflows (users can execute arbitrary code)
+- Strong isolation between workflows in local computing units
+- Complete isolation between workflows in Kubernetes computing units within the same namespace
+- Protection against infrastructure-level compromises
+- Protection against deployment manager misconfigurations
+- DDoS protection (requires external infrastructure)
+- Compliance with specific regulatory requirements without additional configuration
+
+## What are NOT Security Issues
+
+The following are **NOT considered security vulnerabilities** in Texera:
+
+### User Code Execution
+
+REGULAR and ADMIN users can execute arbitrary code (Python, R, Scala) within computing units. This is by design - Texera
+is a data analytics platform where custom code execution is a core feature. The system currently does not sandbox user
+code beyond the isolation provided by the deployment environment (local processes or Kubernetes pods). Deployment
+managers should use resource limits, monitor usage, and restrict user roles appropriately.
+
+### Resource Consumption
+
+Users can create workflows that consume significant CPU, memory, or storage. Texera is designed for data-intensive
+workloads. Deployment managers control this through computing unit resource limits, quotas, and monitoring.
+
+### Information Disclosure within Authorized Access
+
+Users with READ or WRITE access to a resource can view all its contents. Access control is at the resource level - once
+access is granted, full visibility is expected. Resource owners should grant access only to trusted users.
+
+### Public Resources
+
+Resources marked as public are visible to all users. Public sharing is a deliberate collaboration feature. Users should
+review resources before making them public and avoid including sensitive data or credentials.
+
+### Issues Requiring Deployment Manager Access
+
+Issues requiring physical access to servers, administrative access to infrastructure, database access, or access to
+configuration files are out of scope. These access levels are considered trusted.
+
+### Third-Party Dependencies
+
+Theoretical vulnerabilities in dependencies that have not been exploited in Texera's usage are not in scope.
+You are they are welcome to raise an issue or a PR.
+
+## Reporting Security Vulnerabilities
+
+The [Apache Software Foundation](https://apache.org/) takes a rigorous stance on eliminating security issues in its software projects. If you
+find a security bug, with that in mind, please **DO NOT** file public issues (e.g., GitHub issues). Before reporting a
+security issue, check the security model declared above. To report a new vulnerability you have discovered, please
+follow the ASF security [vulnerability reporting process](https://apache.org/security/#reporting-a-vulnerability).
+The Texera community follows the ASF
+security [vulnerability handling process](https://apache.org/security/#vulnerability-handling), and will fix it as soon
+as possible.
+
+## Changes to This Policy
+
+This security policy may be updated from time to time. Significant changes will be announced on the project mailing
+lists and website.
+
+---
+
+**Last Updated**: November 2025
+
+**Disclaimer**: This project is currently undergoing incubation at The Apache Software Foundation (ASF). Incubation is
+required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+decision-making process have stabilized in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project
+has yet to be fully endorsed by the ASF.
+
diff --git a/core/access-control-service/build.sbt b/access-control-service/build.sbt
similarity index 97%
rename from core/access-control-service/build.sbt
rename to access-control-service/build.sbt
index 052dad4c13d..c1168aa39d4 100644
--- a/core/access-control-service/build.sbt
+++ b/access-control-service/build.sbt
@@ -18,7 +18,7 @@
 import scala.collection.Seq
 
 name := "access-control-service"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
@@ -76,6 +76,5 @@ libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
   "io.dropwizard" % "dropwizard-core" % dropwizardVersion,
   "io.dropwizard" % "dropwizard-auth" % dropwizardVersion, // Dropwizard Authentication module
-  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.2",
-  "org.playframework" %% "play-json" % "3.1.0-M1",
+  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.2"
 )
\ No newline at end of file
diff --git a/core/access-control-service/project/build.properties b/access-control-service/project/build.properties
similarity index 100%
rename from core/access-control-service/project/build.properties
rename to access-control-service/project/build.properties
diff --git a/core/access-control-service/src/main/resources/access-control-service-web-config.yaml b/access-control-service/src/main/resources/access-control-service-web-config.yaml
similarity index 100%
rename from core/access-control-service/src/main/resources/access-control-service-web-config.yaml
rename to access-control-service/src/main/resources/access-control-service-web-config.yaml
diff --git a/core/access-control-service/src/main/resources/logback.xml b/access-control-service/src/main/resources/logback.xml
similarity index 92%
rename from core/access-control-service/src/main/resources/logback.xml
rename to access-control-service/src/main/resources/logback.xml
index 4763107b503..6a5e4871b4c 100644
--- a/core/access-control-service/src/main/resources/logback.xml
+++ b/access-control-service/src/main/resources/logback.xml
@@ -29,10 +29,10 @@
 
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>../log/access-control-service.log</file>
+        <file>logs/access-control-service.log</file>
         <immediateFlush>true</immediateFlush>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>../log/access-control-service-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+            <fileNamePattern>logs/access-control-service-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
         </rollingPolicy>
         <encoder>
             <pattern>[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n</pattern>
diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala
similarity index 77%
rename from core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala
rename to access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala
index 02278fd97a6..7fac58328d0 100644
--- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala
+++ b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala
@@ -15,21 +15,25 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
-import io.dropwizard.core.Application
-import io.dropwizard.core.setup.{Bootstrap, Environment}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.util.PathUtils.{configServicePath, accessControlServicePath}
-import edu.uci.ics.texera.auth.{JwtAuthFilter, SessionUser}
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.service.resource.{HealthCheckResource, AccessControlResource}
 import io.dropwizard.auth.AuthDynamicFeature
+import io.dropwizard.core.Application
+import io.dropwizard.core.setup.{Bootstrap, Environment}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.service.resource.{
+  AccessControlResource,
+  HealthCheckResource,
+  LiteLLMModelsResource,
+  LiteLLMProxyResource
+}
 import org.eclipse.jetty.server.session.SessionHandler
-import org.jooq.impl.DSL
 
+import java.nio.file.Path
 
 class AccessControlService extends Application[AccessControlServiceConfiguration] with LazyLogging {
   override def initialize(bootstrap: Bootstrap[AccessControlServiceConfiguration]): Unit = {
@@ -43,7 +47,10 @@ class AccessControlService extends Application[AccessControlServiceConfiguration
     )
   }
 
-  override def run(configuration: AccessControlServiceConfiguration, environment: Environment): Unit = {
+  override def run(
+      configuration: AccessControlServiceConfiguration,
+      environment: Environment
+  ): Unit = {
     // Serve backend at /api
     environment.jersey.setUrlPattern("/api/*")
 
@@ -52,6 +59,8 @@ class AccessControlService extends Application[AccessControlServiceConfiguration
 
     environment.jersey.register(classOf[HealthCheckResource])
     environment.jersey.register(classOf[AccessControlResource])
+    environment.jersey.register(classOf[LiteLLMProxyResource])
+    environment.jersey.register(classOf[LiteLLMModelsResource])
 
     // Register JWT authentication filter
     environment.jersey.register(new AuthDynamicFeature(classOf[JwtAuthFilter]))
@@ -64,7 +73,9 @@ class AccessControlService extends Application[AccessControlServiceConfiguration
 }
 object AccessControlService {
   def main(args: Array[String]): Unit = {
-    val accessControlPath = accessControlServicePath
+    val accessControlPath = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("access-control-service")
       .resolve("src")
       .resolve("main")
       .resolve("resources")
diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlServiceConfiguration.scala b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlServiceConfiguration.scala
similarity index 96%
rename from core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlServiceConfiguration.scala
rename to access-control-service/src/main/scala/org/apache/texera/service/AccessControlServiceConfiguration.scala
index 1f388d8f9a3..a6e4764c16d 100644
--- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlServiceConfiguration.scala
+++ b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlServiceConfiguration.scala
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import io.dropwizard.core.Configuration
 
diff --git a/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala b/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala
new file mode 100644
index 00000000000..1f2e2bc11f9
--- /dev/null
+++ b/access-control-service/src/main/scala/org/apache/texera/service/resource/AccessControlResource.scala
@@ -0,0 +1,331 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.texera.service.resource
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import com.typesafe.scalalogging.LazyLogging
+import jakarta.ws.rs.client.{Client, ClientBuilder, Entity}
+import jakarta.ws.rs.core._
+import jakarta.ws.rs.{Consumes, GET, POST, Path, Produces}
+import org.apache.texera.auth.JwtParser.parseToken
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.auth.util.{ComputingUnitAccess, HeaderField}
+import org.apache.texera.config.{GuiConfig, LLMConfig}
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+
+import java.net.URLDecoder
+import java.nio.charset.StandardCharsets
+import java.util.Optional
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala}
+import scala.util.matching.Regex
+
+object AccessControlResource extends LazyLogging {
+
+  private val mapper: ObjectMapper = new ObjectMapper().registerModule(DefaultScalaModule)
+
+  // Regex for the paths that require authorization
+  private val wsapiWorkflowWebsocket: Regex = """.*/wsapi/workflow-websocket.*""".r
+  private val apiExecutionsStats: Regex = """.*/api/executions/[0-9]+/stats/[0-9]+.*""".r
+  private val apiExecutionsResultExport: Regex = """.*/api/executions/result/export.*""".r
+
+  /**
+    * Authorize the request based on the path and headers.
+    * @param uriInfo URI sent by Envoy or API Gateway
+    * @param headers HTTP headers sent by Envoy or API Gateway which include
+    *                headers sent by the client (browser)
+    * @return HTTP Response with appropriate status code and headers
+    */
+  def authorize(
+      uriInfo: UriInfo,
+      headers: HttpHeaders,
+      bodyOpt: Option[String] = None
+  ): Response = {
+    val path = uriInfo.getPath
+    logger.info(s"Authorizing request for path: $path")
+
+    path match {
+      case wsapiWorkflowWebsocket() | apiExecutionsStats() | apiExecutionsResultExport() =>
+        checkComputingUnitAccess(uriInfo, headers, bodyOpt)
+      case _ =>
+        logger.warn(s"No authorization logic for path: $path. Denying access.")
+        Response.status(Response.Status.FORBIDDEN).build()
+    }
+  }
+
+  private def checkComputingUnitAccess(
+      uriInfo: UriInfo,
+      headers: HttpHeaders,
+      bodyOpt: Option[String]
+  ): Response = {
+    val queryParams: Map[String, String] = uriInfo
+      .getQueryParameters()
+      .asScala
+      .view
+      .mapValues(values => values.asScala.headOption.getOrElse(""))
+      .toMap
+
+    logger.info(
+      s"Request URI: ${uriInfo.getRequestUri} and headers: ${headers.getRequestHeaders.asScala} and queryParams: $queryParams"
+    )
+
+    val token: String = {
+      val qToken = queryParams.get("access-token").filter(_.nonEmpty)
+      val hToken = Option(headers.getRequestHeader("Authorization"))
+        .flatMap(_.asScala.headOption)
+        .map(_.replaceFirst("(?i)^Bearer\\s+", "")) // case-insensitive "Bearer "
+        .map(_.trim)
+        .filter(_.nonEmpty)
+      val bToken = bodyOpt.flatMap(extractTokenFromBody)
+      qToken.orElse(hToken).orElse(bToken).getOrElse("")
+    }
+    logger.info(s"token extracted from request $token")
+    val cuid = queryParams.getOrElse("cuid", "")
+    val cuidInt =
+      try {
+        cuid.toInt
+      } catch {
+        case _: NumberFormatException =>
+          return Response.status(Response.Status.FORBIDDEN).build()
+      }
+
+    var cuAccess: PrivilegeEnum = PrivilegeEnum.NONE
+    var userSession: Optional[SessionUser] = Optional.empty()
+    try {
+      userSession = parseToken(token)
+      if (userSession.isEmpty)
+        return Response.status(Response.Status.FORBIDDEN).build()
+
+      val uid = userSession.get().getUid
+      cuAccess = ComputingUnitAccess.getComputingUnitAccess(cuidInt, uid)
+      if (cuAccess == PrivilegeEnum.NONE)
+        return Response.status(Response.Status.FORBIDDEN).build()
+    } catch {
+      case e: Exception =>
+        logger.error(s"Failed parsing token $e")
+        return Response.status(Response.Status.FORBIDDEN).build()
+    }
+
+    Response
+      .ok()
+      .header(HeaderField.UserComputingUnitAccess, cuAccess.toString)
+      .header(HeaderField.UserId, userSession.get().getUid.toString)
+      .header(HeaderField.UserName, userSession.get().getName)
+      .header(HeaderField.UserEmail, userSession.get().getEmail)
+      .build()
+  }
+
+  // Extracts a top-level "token" field from a JSON body
+  private def extractTokenFromBody(body: String): Option[String] = {
+    // 1) Try JSON
+    val jsonToken: Option[String] =
+      try {
+        val node = mapper.readTree(body)
+        if (node != null && node.has("token"))
+          Option(node.get("token").asText()).map(_.trim).filter(_.nonEmpty)
+        else None
+      } catch {
+        case _: Exception => None
+      }
+
+    // 2) Try application/x-www-form-urlencoded
+    def extractTokenFromUrlEncoded(s: String): Option[String] = {
+      // fast path: must contain '=' or '&'
+      if (!s.contains("=")) return None
+      val pairs = s.split("&").iterator
+      var found: Option[String] = None
+      while (pairs.hasNext && found.isEmpty) {
+        val p = pairs.next()
+        val idx = p.indexOf('=')
+        val key = if (idx >= 0) p.substring(0, idx) else p
+        if (key == "token") {
+          val raw = if (idx >= 0) p.substring(idx + 1) else ""
+          val decoded = URLDecoder.decode(raw, StandardCharsets.UTF_8.name())
+          val v = decoded.trim
+          if (v.nonEmpty) found = Some(v)
+        }
+      }
+      found
+    }
+
+    // 3) Try multipart/form-data (best-effort; parses raw body text)
+    def extractTokenFromMultipart(s: String): Option[String] = {
+      // Look for the part with name="token" and capture its content until the next boundary
+      val partWithBoundary = "(?s)name\\s*=\\s*\"token\"[^\\r\\n]*\\r?\\n\\r?\\n(.*?)\\r?\\n--".r
+      val partToEnd = "(?s)name\\s*=\\s*\"token\"[^\\r\\n]*\\r?\\n\\r?\\n(.*)".r
+
+      partWithBoundary
+        .findFirstMatchIn(s)
+        .map(_.group(1).trim)
+        .filter(_.nonEmpty)
+        .orElse(partToEnd.findFirstMatchIn(s).map(_.group(1).trim).filter(_.nonEmpty))
+    }
+
+    jsonToken
+      .orElse(extractTokenFromUrlEncoded(body))
+      .orElse(extractTokenFromMultipart(body))
+  }
+}
+@Produces(Array(MediaType.APPLICATION_JSON))
+@Path("/auth")
+class AccessControlResource extends LazyLogging {
+
+  @GET
+  @Path("/{path:.*}")
+  def authorizeGet(
+      @Context uriInfo: UriInfo,
+      @Context headers: HttpHeaders
+  ): Response = {
+    AccessControlResource.authorize(uriInfo, headers)
+  }
+
+  @POST
+  @Path("/{path:.*}")
+  def authorizePost(
+      @Context uriInfo: UriInfo,
+      @Context headers: HttpHeaders,
+      body: String
+  ): Response = {
+    logger.info("Request body: " + body)
+    AccessControlResource.authorize(uriInfo, headers, Option(body).map(_.trim).filter(_.nonEmpty))
+  }
+}
+
+@Path("/chat")
+@Produces(Array(MediaType.APPLICATION_JSON))
+@Consumes(Array(MediaType.APPLICATION_JSON))
+class LiteLLMProxyResource extends LazyLogging {
+
+  private val client: Client = ClientBuilder.newClient()
+  private val litellmBaseUrl: String = LLMConfig.baseUrl
+  private val litellmApiKey: String = LLMConfig.masterKey
+
+  @POST
+  @Path("/{path:.*}")
+  def proxyPost(
+      @Context uriInfo: UriInfo,
+      @Context headers: HttpHeaders,
+      body: String
+  ): Response = {
+    if (!GuiConfig.guiWorkflowWorkspaceCopilotEnabled) {
+      return Response
+        .status(Response.Status.FORBIDDEN)
+        .entity("""{"error": "Copilot feature is disabled"}""")
+        .build()
+    }
+
+    // uriInfo.getPath returns "chat/completions" for /api/chat/completions
+    // We want to forward as "/chat/completions" to LiteLLM
+    val fullPath = uriInfo.getPath
+    val targetUrl = s"$litellmBaseUrl/$fullPath"
+
+    logger.info(s"Proxying POST request to LiteLLM: $targetUrl")
+
+    try {
+      val requestBuilder = client
+        .target(targetUrl)
+        .request(MediaType.APPLICATION_JSON)
+        .header("Authorization", s"Bearer $litellmApiKey")
+
+      // Forward other relevant headers from the original request
+      headers.getRequestHeaders.asScala.foreach {
+        case (key, values)
+            if !key.equalsIgnoreCase("Authorization") &&
+              !key.equalsIgnoreCase("Host") &&
+              !key.equalsIgnoreCase("Content-Length") =>
+          values.asScala.foreach(value => requestBuilder.header(key, value))
+        case _ => // Skip Authorization, Host, and Content-Length headers
+      }
+
+      val response = requestBuilder.post(Entity.json(body))
+
+      // Build response with same status and body from LiteLLM
+      val responseBody = response.readEntity(classOf[String])
+      val responseBuilder = Response
+        .status(response.getStatus)
+        .entity(responseBody)
+
+      // Forward response headers
+      response.getHeaders.asScala.foreach {
+        case (key, values) =>
+          values.asScala.foreach(value => responseBuilder.header(key, value))
+      }
+
+      responseBuilder.build()
+    } catch {
+      case e: Exception =>
+        logger.error(s"Error proxying request to LiteLLM: ${e.getMessage}", e)
+        Response
+          .status(Response.Status.BAD_GATEWAY)
+          .entity(s"""{"error": "Failed to proxy request to LiteLLM: ${e.getMessage}"}""")
+          .build()
+    }
+  }
+}
+
+@Path("/models")
+@Produces(Array(MediaType.APPLICATION_JSON))
+class LiteLLMModelsResource extends LazyLogging {
+
+  private val client: Client = ClientBuilder.newClient()
+  private val litellmBaseUrl: String = LLMConfig.baseUrl
+  private val litellmApiKey: String = LLMConfig.masterKey
+
+  @GET
+  def getModels: Response = {
+    if (!GuiConfig.guiWorkflowWorkspaceCopilotEnabled) {
+      return Response
+        .status(Response.Status.FORBIDDEN)
+        .entity("""{"error": "Copilot feature is disabled"}""")
+        .build()
+    }
+
+    val targetUrl = s"$litellmBaseUrl/models"
+
+    logger.info(s"Fetching models from LiteLLM: $targetUrl")
+
+    try {
+      val response = client
+        .target(targetUrl)
+        .request(MediaType.APPLICATION_JSON)
+        .header("Authorization", s"Bearer $litellmApiKey")
+        .get()
+
+      // Build response with same status and body from LiteLLM
+      val responseBody = response.readEntity(classOf[String])
+      val responseBuilder = Response
+        .status(response.getStatus)
+        .entity(responseBody)
+
+      // Forward response headers
+      response.getHeaders.asScala.foreach {
+        case (key, values) =>
+          values.asScala.foreach(value => responseBuilder.header(key, value))
+      }
+
+      responseBuilder.build()
+    } catch {
+      case e: Exception =>
+        logger.error(s"Error fetching models from LiteLLM: ${e.getMessage}", e)
+        Response
+          .status(Response.Status.BAD_GATEWAY)
+          .entity(s"""{"error": "Failed to fetch models from LiteLLM: ${e.getMessage}"}""")
+          .build()
+    }
+  }
+}
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala b/access-control-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 96%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
rename to access-control-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
index 895f6a400af..08ecd1cd0cb 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
+++ b/access-control-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
 import jakarta.ws.rs.core.MediaType
 import jakarta.ws.rs.{GET, Path, Produces}
diff --git a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala b/access-control-service/src/test/scala/org/apache/texera/AccessControlResourceSpec.scala
similarity index 88%
rename from core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala
rename to access-control-service/src/test/scala/org/apache/texera/AccessControlResourceSpec.scala
index 349ec334aac..751b51022f4 100644
--- a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala
+++ b/access-control-service/src/test/scala/org/apache/texera/AccessControlResourceSpec.scala
@@ -15,16 +15,28 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package edu.uci.ics.texera
-
-import edu.uci.ics.texera.auth.JwtAuth
-import edu.uci.ics.texera.auth.util.HeaderField
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.enums.{PrivilegeEnum, UserRoleEnum, WorkflowComputingUnitTypeEnum}
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ComputingUnitUserAccessDao, UserDao, WorkflowComputingUnitDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{ComputingUnitUserAccess, User, WorkflowComputingUnit}
-import edu.uci.ics.texera.service.resource.AccessControlResource
+package org.apache.texera
+
 import jakarta.ws.rs.core.{HttpHeaders, MultivaluedHashMap, Response, UriInfo}
+import org.apache.texera.auth.JwtAuth
+import org.apache.texera.auth.util.HeaderField
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.enums.{
+  PrivilegeEnum,
+  UserRoleEnum,
+  WorkflowComputingUnitTypeEnum
+}
+import org.apache.texera.dao.jooq.generated.tables.daos.{
+  ComputingUnitUserAccessDao,
+  UserDao,
+  WorkflowComputingUnitDao
+}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{
+  ComputingUnitUserAccess,
+  User,
+  WorkflowComputingUnit
+}
+import org.apache.texera.service.resource.AccessControlResource
 import org.mockito.Mockito._
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
@@ -33,11 +45,12 @@ import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 import java.net.URI
 import java.util
 
-class AccessControlResourceSpec extends AnyFlatSpec
-  with Matchers
-  with BeforeAndAfterAll
-  with BeforeAndAfterEach
-  with MockTexeraDB {
+class AccessControlResourceSpec
+    extends AnyFlatSpec
+    with Matchers
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach
+    with MockTexeraDB {
 
   private val testURI: String = "http://localhost:8080/"
   private val testPath: String = "/api/executions/1/stats/1"
@@ -129,7 +142,8 @@ class AccessControlResourceSpec extends AnyFlatSpec
     when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI))
     when(mockUriInfo.getPath).thenReturn(testPath)
     when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders)
-    when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer dummy-token"))
+    when(mockHttpHeaders.getRequestHeader("Authorization"))
+      .thenReturn(util.Arrays.asList("Bearer dummy-token"))
 
     val accessControlResource = new AccessControlResource()
     val response = accessControlResource.authorizeGet(mockUriInfo, mockHttpHeaders)
@@ -151,7 +165,7 @@ class AccessControlResourceSpec extends AnyFlatSpec
     when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(new util.ArrayList[String]())
 
     val accessControlResource = new AccessControlResource()
-    val response = accessControlResource.authorizePost(mockUriInfo, mockHttpHeaders)
+    val response = accessControlResource.authorizePost(mockUriInfo, mockHttpHeaders, null)
 
     response.getStatus shouldBe Response.Status.FORBIDDEN.getStatusCode
   }
@@ -174,7 +188,8 @@ class AccessControlResourceSpec extends AnyFlatSpec
     when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI))
     when(mockUriInfo.getPath).thenReturn(testPath)
     when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders)
-    when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer " + token))
+    when(mockHttpHeaders.getRequestHeader("Authorization"))
+      .thenReturn(util.Arrays.asList("Bearer " + token))
 
     // Instantiate the resource and call the method under test
     val accessControlResource = new AccessControlResource()
@@ -202,7 +217,8 @@ class AccessControlResourceSpec extends AnyFlatSpec
     when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI))
     when(mockUriInfo.getPath).thenReturn(testPath)
     when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders)
-    when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer " + token))
+    when(mockHttpHeaders.getRequestHeader("Authorization"))
+      .thenReturn(util.Arrays.asList("Bearer " + token))
 
     // Instantiate the resource and call the method under test
     val accessControlResource = new AccessControlResource()
@@ -217,4 +233,4 @@ class AccessControlResourceSpec extends AnyFlatSpec
     response.getHeaderString(HeaderField.UserName) shouldBe testUser1.getName
     response.getHeaderString(HeaderField.UserEmail) shouldBe testUser1.getEmail
   }
-}
\ No newline at end of file
+}
diff --git a/core/amber/.scalafix.conf b/amber/.scalafix.conf
similarity index 100%
rename from core/amber/.scalafix.conf
rename to amber/.scalafix.conf
diff --git a/core/amber/.scalafmt.conf b/amber/.scalafmt.conf
similarity index 100%
rename from core/amber/.scalafmt.conf
rename to amber/.scalafmt.conf
diff --git a/core/amber/DESCRIPTION b/amber/DESCRIPTION
similarity index 100%
rename from core/amber/DESCRIPTION
rename to amber/DESCRIPTION
diff --git a/core/amber/README.md b/amber/README.md
similarity index 100%
rename from core/amber/README.md
rename to amber/README.md
diff --git a/core/amber/build.sbt b/amber/build.sbt
similarity index 88%
rename from core/amber/build.sbt
rename to amber/build.sbt
index d6d4dc73232..7d0616922f7 100644
--- a/core/amber/build.sbt
+++ b/amber/build.sbt
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-name := "texera"
-organization := "edu.uci.ics"
+name := "amber"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
@@ -49,23 +49,23 @@ Compile / unmanagedSourceDirectories += baseDirectory.value / "src" / "main" / "
 PB.generate / excludeFilter := "scalapb.proto"
 
 /////////////////////////////////////////////////////////////////////////////
-// Akka related
-val akkaVersion = "2.6.21"
-val akkaDependencies = Seq(
-  "com.typesafe.akka" %% "akka-actor" % akkaVersion,
-  "com.typesafe.akka" %% "akka-remote" % akkaVersion,
-  "com.typesafe.akka" %% "akka-cluster" % akkaVersion,
-  "com.typesafe.akka" %% "akka-cluster-metrics" % akkaVersion,
-  "com.typesafe.akka" %% "akka-cluster-tools" % akkaVersion,
-  "com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion % Test,
-  "com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test,
-  "com.typesafe.akka" %% "akka-persistence" % akkaVersion,
+// Pekko related
+val pekkoVersion = "1.2.1"
+val pekkoDependencies = Seq(
+  "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
+  "org.apache.pekko" %% "pekko-remote" % pekkoVersion,
+  "org.apache.pekko" %% "pekko-cluster" % pekkoVersion,
+  "org.apache.pekko" %% "pekko-cluster-metrics" % pekkoVersion,
+  "org.apache.pekko" %% "pekko-cluster-tools" % pekkoVersion,
+  "org.apache.pekko" %% "pekko-multi-node-testkit" % pekkoVersion % Test,
+  "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
+  "org.apache.pekko" %% "pekko-persistence" % pekkoVersion,
   "io.kamon" % "sigar-loader" % "1.6.6-rev002",
-  "com.softwaremill.macwire" %% "macros" % "2.5.8" % Provided,
-  "com.softwaremill.macwire" %% "macrosakka" % "2.5.8" % Provided,
-  "com.softwaremill.macwire" %% "util" % "2.5.8",
-  "com.softwaremill.macwire" %% "proxy" % "2.5.8",
-  "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
+  "com.softwaremill.macwire" %% "macros" % "2.6.7" % Provided,
+  "com.softwaremill.macwire" %% "macrospekko" % "2.6.7" % Provided,
+  "com.softwaremill.macwire" %% "util" % "2.6.7",
+  "com.softwaremill.macwire" %% "proxy" % "2.6.7",
+  "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
   "ch.qos.logback" % "logback-classic" % "1.2.13" % Test
 )
 
@@ -137,7 +137,7 @@ val googleServiceDependencies = Seq(
   "com.sun.mail" % "javax.mail" % "1.6.2"
 )
 
-libraryDependencies ++= akkaDependencies
+libraryDependencies ++= pekkoDependencies
 libraryDependencies ++= luceneDependencies
 libraryDependencies ++= dropwizardDependencies
 libraryDependencies ++= mbknorJacksonJsonSchemaDependencies
@@ -222,8 +222,15 @@ libraryDependencies += "org.jooq" % "jooq" % "3.14.16"
 // https://mvnrepository.com/artifact/org.jgrapht/jgrapht-core
 libraryDependencies += "org.jgrapht" % "jgrapht-core" % "1.4.0"
 
-// https://mvnrepository.com/artifact/io.altoo/akka-kryo-serialization
-libraryDependencies += "io.altoo" %% "akka-kryo-serialization" % "2.5.2"
+// https://mvnrepository.com/artifact/com.esotericsoftware/kryo
+libraryDependencies += "com.esotericsoftware" % "kryo" % "5.6.2"
+libraryDependencies += "com.esotericsoftware" % "kryo5" % "5.6.0"
+
+// https://mvnrepository.com/artifact/io.altoo/pekko-kryo-serialization
+libraryDependencies += "io.altoo" %% "pekko-kryo-serialization" % "1.3.0"
+
+// https://mvnrepository.com/artifact/io.altoo/scala-kryo-serialization
+libraryDependencies += "io.altoo" %% "scala-kryo-serialization" % "1.3.0"
 
 // https://mvnrepository.com/artifact/com.twitter/util-core
 libraryDependencies += "com.twitter" %% "util-core" % "22.12.0"
diff --git a/core/amber/operator-requirements.txt b/amber/operator-requirements.txt
similarity index 96%
rename from core/amber/operator-requirements.txt
rename to amber/operator-requirements.txt
index fd33ef7470c..3328d152f08 100644
--- a/core/amber/operator-requirements.txt
+++ b/amber/operator-requirements.txt
@@ -22,3 +22,5 @@ pillow==10.2.0
 pybase64==1.3.2
 torch==2.8.0
 scikit-learn==1.5.0
+transformers==4.57.3
+boto3==1.40.53
diff --git a/core/amber/project/build.properties b/amber/project/build.properties
similarity index 100%
rename from core/amber/project/build.properties
rename to amber/project/build.properties
diff --git a/core/amber/project/plugins.sbt b/amber/project/plugins.sbt
similarity index 100%
rename from core/amber/project/plugins.sbt
rename to amber/project/plugins.sbt
diff --git a/core/amber/requirements.txt b/amber/requirements.txt
similarity index 92%
rename from core/amber/requirements.txt
rename to amber/requirements.txt
index a1fc2c9c2da..e0eea88b44a 100644
--- a/core/amber/requirements.txt
+++ b/amber/requirements.txt
@@ -16,17 +16,16 @@
 # under the License.
 
 wheel==0.41.2
-numpy==1.26.4
-pandas==2.2.2
-flake8==7.1.1
-black==24.3.0
+numpy==2.1.0
+pandas==2.2.3
+ruff==0.14.7
 iniconfig==1.1.1
 loguru==0.7.0
 pyarrow==21.0.0
 pytest==7.4.0
 python-dateutil==2.8.2
 pytest-timeout==2.2.0
-protobuf==3.20.3
+protobuf==4.25.8
 betterproto==2.0.0b7
 typing==3.7.4.3
 pampy==0.3.0
@@ -42,11 +41,10 @@ python-lsp-server[websockets]==1.12.0
 bidict==0.22.0
 cached_property==1.5.2
 psutil==5.9.0
-transformers==4.44.2
 tzlocal==2.1
 pyiceberg==0.8.1
 readerwriterlock==1.0.9
 tenacity==8.5.0
 SQLAlchemy==2.0.37
-pg8000==1.31.2
+pg8000==1.31.5
 pympler==1.1
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto
similarity index 90%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto
index 7e9c65b3a4a..ed17be236dc 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto
@@ -16,13 +16,13 @@
 // under the License.
 
 syntax = "proto3";
-package edu.uci.ics.amber.engine.architecture.rpc;
+package org.apache.texera.amber.engine.architecture.rpc;
 
-import "edu/uci/ics/amber/core/virtualidentity.proto";
-import "edu/uci/ics/amber/core/workflow.proto";
-import "edu/uci/ics/amber/core/executor.proto";
-import "edu/uci/ics/amber/engine/architecture/worker/statistics.proto";
-import "edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto";
+import "org/apache/texera/amber/core/virtualidentity.proto";
+import "org/apache/texera/amber/core/workflow.proto";
+import "org/apache/texera/amber/core/executor.proto";
+import "org/apache/texera/amber/engine/architecture/worker/statistics.proto";
+import "org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto";
 import "scalapb/scalapb.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
@@ -81,7 +81,7 @@ message AsyncRPCContext {
 }
 
 message ControlInvocation {
-  option (scalapb.message).extends = "edu.uci.ics.amber.engine.common.ambermessage.DirectControlMessagePayload";
+  option (scalapb.message).extends = "org.apache.texera.amber.engine.common.ambermessage.DirectControlMessagePayload";
   string methodName = 1;
   ControlRequest command = 2 [(scalapb.field).no_box = true];
   AsyncRPCContext context = 3;
@@ -95,7 +95,7 @@ enum EmbeddedControlMessageType {
 }
 
 message EmbeddedControlMessage {
-  option (scalapb.message).extends = "edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload";
+  option (scalapb.message).extends = "org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload";
   core.EmbeddedControlMessageIdentity id = 1 [(scalapb.field).no_box = true];
   EmbeddedControlMessageType ecm_type = 2;
   repeated core.ChannelIdentity scope = 3;
@@ -150,7 +150,7 @@ enum ConsoleMessageType{
 }
 
 message ConsoleMessage {
-  option (scalapb.message).extends = "edu.uci.ics.amber.engine.architecture.controller.ClientEvent";
+  option (scalapb.message).extends = "org.apache.texera.amber.engine.architecture.controller.ClientEvent";
   string worker_id = 1;
   google.protobuf.Timestamp timestamp = 2  [(scalapb.field).no_box = true];
   ConsoleMessageType msg_type = 3;
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controllerservice.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto
similarity index 90%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controllerservice.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto
index e84e4a7cc4a..70d189a3411 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controllerservice.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto
@@ -16,10 +16,10 @@
 // under the License.
 
 syntax = "proto3";
-package edu.uci.ics.amber.engine.architecture.rpc;
+package org.apache.texera.amber.engine.architecture.rpc;
 
-import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto";
-import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto
similarity index 93%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto
index 164d4c54b6b..43613b5cfdc 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto
@@ -16,9 +16,9 @@
 // under the License.
 
 syntax = "proto3";
-package edu.uci.ics.amber.engine.architecture.rpc;
+package org.apache.texera.amber.engine.architecture.rpc;
 
-import "edu/uci/ics/amber/engine/architecture/worker/statistics.proto";
+import "org/apache/texera/amber/engine/architecture/worker/statistics.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
@@ -67,7 +67,7 @@ message ControlError {
 }
 
 message ReturnInvocation {
-  option (scalapb.message).extends = "edu.uci.ics.amber.engine.common.ambermessage.DirectControlMessagePayload";
+  option (scalapb.message).extends = "org.apache.texera.amber.engine.common.ambermessage.DirectControlMessagePayload";
   int64 commandId = 1;
   ControlReturn returnValue = 2 [(scalapb.field).no_box = true];
 }
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/testerservice.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/testerservice.proto
similarity index 87%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/testerservice.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/testerservice.proto
index bc5dad3a0ec..229b03f689c 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/testerservice.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/testerservice.proto
@@ -16,10 +16,10 @@
 // under the License.
 
 syntax = "proto3";
-package edu.uci.ics.amber.engine.architecture.rpc;
+package org.apache.texera.amber.engine.architecture.rpc;
 
-import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto";
-import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/workerservice.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/workerservice.proto
similarity index 91%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/workerservice.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/workerservice.proto
index 97e90b52e57..dbcd6d8a5e0 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/workerservice.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/workerservice.proto
@@ -16,10 +16,10 @@
 // under the License.
 
 syntax = "proto3";
-package edu.uci.ics.amber.engine.architecture.rpc;
+package org.apache.texera.amber.engine.architecture.rpc;
 
-import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto";
-import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto
similarity index 93%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto
index 950ae366037..813a4041b31 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics;
+package org.apache.texera.amber.engine.architecture.sendsemantics;
 
-import "edu/uci/ics/amber/core/virtualidentity.proto";
+import "org/apache/texera/amber/core/virtualidentity.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/worker/statistics.proto
similarity index 93%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/worker/statistics.proto
index b1fdaea6445..85d1fcf4aaa 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/worker/statistics.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.engine.architecture.worker;
+package org.apache.texera.amber.engine.architecture.worker;
 
-import "edu/uci/ics/amber/core/workflow.proto";
+import "org/apache/texera/amber/core/workflow.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/actormessage.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/actormessage.proto
similarity index 96%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/actormessage.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/common/actormessage.proto
index 6ada8e3c046..2a548e6f753 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/actormessage.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/actormessage.proto
@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.engine.common;
+package org.apache.texera.amber.engine.common;
 
 import "scalapb/scalapb.proto";
 
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/ambermessage.proto
similarity index 84%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/common/ambermessage.proto
index 141c1abb1e1..54bd36abfc4 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/ambermessage.proto
@@ -17,11 +17,11 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.engine.common;
+package org.apache.texera.amber.engine.common;
 
-import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto";
-import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto";
-import "edu/uci/ics/amber/core/virtualidentity.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto";
+import "org/apache/texera/amber/core/virtualidentity.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/executionruntimestate.proto
similarity index 86%
rename from core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto
rename to amber/src/main/protobuf/org/apache/texera/amber/engine/common/executionruntimestate.proto
index 3f23c0c44d0..e712b3adc8a 100644
--- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto
+++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/executionruntimestate.proto
@@ -17,13 +17,13 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.engine.common;
+package org.apache.texera.amber.engine.common;
 
-import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto";
-import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto";
-import "edu/uci/ics/amber/engine/architecture/worker/statistics.proto";
-import "edu/uci/ics/amber/core/virtualidentity.proto";
-import "edu/uci/ics/amber/core/workflowruntimestate.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto";
+import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto";
+import "org/apache/texera/amber/engine/architecture/worker/statistics.proto";
+import "org/apache/texera/amber/core/virtualidentity.proto";
+import "org/apache/texera/amber/core/workflowruntimestate.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/amber/src/main/python/core/__init__.py b/amber/src/main/python/core/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/__init__.py
rename to amber/src/main/python/core/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/__init__.py b/amber/src/main/python/core/architecture/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/__init__.py
rename to amber/src/main/python/core/architecture/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/handlers/__init__.py b/amber/src/main/python/core/architecture/handlers/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/handlers/__init__.py
rename to amber/src/main/python/core/architecture/handlers/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py b/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py
rename to amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py
index fc24f31dcf3..59a68312cf8 100644
--- a/core/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py
+++ b/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py
@@ -18,7 +18,7 @@
 from abc import ABC
 
 from core.models import InternalQueue
-from proto.edu.uci.ics.amber.engine.common import ActorCommand
+from proto.org.apache.texera.amber.engine.common import ActorCommand
 
 
 class ActorCommandHandler(ABC):
diff --git a/core/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py b/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py
rename to amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py
index f7944505f27..764348b1d13 100644
--- a/core/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py
@@ -18,21 +18,19 @@
 from core.architecture.handlers.actorcommand.actor_handler_base import (
     ActorCommandHandler,
 )
-
 from core.models.internal_queue import DCMElement, InternalQueue
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ControlInvocation,
     ControlRequest,
     EmptyRequest,
     AsyncRpcContext,
 )
-
-from proto.edu.uci.ics.amber.engine.common import (
+from proto.org.apache.texera.amber.engine.common import (
     Backpressure,
     DirectControlMessagePayloadV2,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity, ChannelIdentity
 
 
 class BackpressureHandler(ActorCommandHandler):
diff --git a/core/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py b/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py
similarity index 94%
rename from core/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py
rename to amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py
index c42f5df75d4..b7430b0fefb 100644
--- a/core/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py
@@ -19,7 +19,7 @@
     ActorCommandHandler,
 )
 from core.models import InternalQueue
-from proto.edu.uci.ics.amber.engine.common import CreditUpdate
+from proto.org.apache.texera.amber.engine.common import CreditUpdate
 
 
 class CreditUpdateHandler(ActorCommandHandler):
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/__init__.py b/amber/src/main/python/core/architecture/handlers/control/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/handlers/control/__init__.py
rename to amber/src/main/python/core/architecture/handlers/control/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py b/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py
similarity index 95%
rename from core/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py
index de7630dd0ba..9d398210b52 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py
@@ -16,7 +16,7 @@
 # under the License.
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     AddInputChannelRequest,
 )
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py b/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py
similarity index 94%
rename from core/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py
index dc4bc160977..b4a88d0fe12 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py
@@ -16,14 +16,13 @@
 # under the License.
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     AddPartitioningRequest,
 )
 
 
 class AddPartitioningHandler(ControlHandler):
-
     async def add_partitioning(self, req: AddPartitioningRequest) -> EmptyReturn:
         self.context.output_manager.add_partitioning(req.tag, req.partitioning)
         return EmptyReturn()
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py b/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py
index e67372d3b63..73ebad26b31 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py
@@ -18,15 +18,14 @@
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.models import Schema
 from core.util.virtual_identity import get_from_actor_id_for_input_port_storage
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity, ChannelIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     AssignPortRequest,
 )
 
 
 class AssignPortHandler(ControlHandler):
-
     async def assign_port(self, req: AssignPortRequest) -> EmptyReturn:
         if req.input:
             self.context.input_manager.add_input_port(
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py b/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py
rename to amber/src/main/python/core/architecture/handlers/control/control_handler_base.py
index 49d246b0838..9378a5e561b 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py
+++ b/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from proto.edu.uci.ics.amber.engine.architecture.rpc import WorkerServiceBase
+from proto.org.apache.texera.amber.engine.architecture.rpc import WorkerServiceBase
 
 
 class ControlHandler(WorkerServiceBase):
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py b/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py
index f626ecdabfc..e7d35a64173 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py
@@ -18,7 +18,7 @@
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.architecture.managers.context import Context
 from core.architecture.managers.pause_manager import PauseType
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     DebugCommandRequest,
 )
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py b/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py
similarity index 92%
rename from core/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py
index 093e7ff72c5..d60b3874754 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py
@@ -16,8 +16,11 @@
 # under the License.
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest
 from core.models.internal_marker import EndChannel
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
+    EmptyReturn,
+    EmptyRequest,
+)
 
 
 class EndChannelHandler(ControlHandler):
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py
similarity index 96%
rename from core/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py
index 2b880741019..434225a5f0a 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py
@@ -19,7 +19,7 @@
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.util import IQueue
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     EmptyRequest,
 )
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py b/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py
similarity index 95%
rename from core/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py
index 8138150d0d5..b5c63acc55c 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py
@@ -17,14 +17,13 @@
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.util.expression_evaluator import ExpressionEvaluator
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EvaluatedValue,
     EvaluatePythonExpressionRequest,
 )
 
 
 class EvaluateExpressionHandler(ControlHandler):
-
     async def evaluate_python_expression(
         self, req: EvaluatePythonExpressionRequest
     ) -> EvaluatedValue:
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py b/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py
index dd86ca49829..2c2dc1ad3c7 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py
@@ -17,15 +17,14 @@
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.util import get_one_of
-from proto.edu.uci.ics.amber.core import OpExecWithCode
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import OpExecWithCode
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     InitializeExecutorRequest,
 )
 
 
 class InitializeExecutorHandler(ControlHandler):
-
     async def initialize_executor(self, req: InitializeExecutorRequest) -> EmptyReturn:
         op_exec_with_code: OpExecWithCode = get_one_of(req.op_exec_init_info)
         self.context.executor_manager.initialize_executor(
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py b/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py
index 350f163358a..926ceb61533 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py
@@ -16,13 +16,12 @@
 # under the License.
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmptyReturn,
     EmptyRequest,
 )
 
 
 class NoOperationHandler(ControlHandler):
-
     async def no_operation(self, req: EmptyRequest) -> EmptyReturn:
         return EmptyReturn()
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py b/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py
index 16fdd791d77..2b178da5569 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py
@@ -16,11 +16,13 @@
 # under the License.
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
+    EmptyReturn,
+    EmptyRequest,
+)
 
 
 class OpenExecutorHandler(ControlHandler):
-
     async def open_executor(self, req: EmptyRequest) -> EmptyReturn:
         self.context.executor_manager.executor.open()
         return EmptyReturn()
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py
similarity index 94%
rename from core/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py
index 8ecb3ead2d0..ef9188914e0 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py
@@ -17,14 +17,13 @@
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.architecture.managers.pause_manager import PauseType
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     WorkerStateResponse,
     EmptyRequest,
 )
 
 
 class PauseWorkerHandler(ControlHandler):
-
     async def pause_worker(self, req: EmptyRequest) -> WorkerStateResponse:
         self.context.pause_manager.pause(PauseType.USER_PAUSE)
         state = self.context.state_manager.get_current_state()
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py b/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py
similarity index 90%
rename from core/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py
index 8f791e2e515..b636249d714 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py
@@ -15,18 +15,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from core.architecture.handlers.control.control_handler_base import ControlHandler
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     WorkerMetricsResponse,
     EmptyRequest,
 )
-from proto.edu.uci.ics.amber.engine.architecture.worker import (
+from proto.org.apache.texera.amber.engine.architecture.worker import (
     WorkerMetrics,
 )
-from core.architecture.handlers.control.control_handler_base import ControlHandler
 
 
 class QueryStatisticsHandler(ControlHandler):
-
     async def query_statistics(self, req: EmptyRequest) -> WorkerMetricsResponse:
         metrics = WorkerMetrics(
             worker_state=self.context.state_manager.get_current_state(),
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py b/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py
similarity index 90%
rename from core/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py
index 077242ae343..5a916c4094a 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py
@@ -19,14 +19,16 @@
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.architecture.managers.pause_manager import PauseType
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest
-from proto.edu.uci.ics.amber.engine.architecture.worker import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
+    EmptyReturn,
+    EmptyRequest,
+)
+from proto.org.apache.texera.amber.engine.architecture.worker import (
     WorkerState,
 )
 
 
 class RetryCurrentTupleHandler(ControlHandler):
-
     async def retry_current_tuple(self, req: EmptyRequest) -> EmptyReturn:
         if not self.context.state_manager.confirm_state(WorkerState.COMPLETED):
             # chain the current input tuple back on top of the current iterator to
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py
similarity index 94%
rename from core/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py
index 42904ec4a7c..3ebaadb6611 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py
@@ -17,14 +17,13 @@
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
 from core.architecture.managers.pause_manager import PauseType
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     WorkerStateResponse,
     EmptyRequest,
 )
 
 
 class ResumeWorkerHandler(ControlHandler):
-
     async def resume_worker(self, req: EmptyRequest) -> WorkerStateResponse:
         self.context.pause_manager.resume(PauseType.USER_PAUSE)
         state = self.context.state_manager.get_current_state()
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py b/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py
index 75958f5eeeb..36747351e1e 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py
@@ -16,8 +16,11 @@
 # under the License.
 
 from core.architecture.handlers.control.control_handler_base import ControlHandler
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest
 from core.models.internal_marker import StartChannel
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
+    EmptyReturn,
+    EmptyRequest,
+)
 
 
 class StartChannelHandler(ControlHandler):
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py
similarity index 95%
rename from core/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py
index fd57bc67c67..bfa1556722f 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py
@@ -15,14 +15,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from core.architecture.handlers.control.control_handler_base import ControlHandler
+from core.architecture.packaging.input_manager import InputManager
 from core.models import Schema
-from proto.edu.uci.ics.amber.core import (
+from core.models.internal_queue import ECMElement
+from proto.org.apache.texera.amber.core import (
     ChannelIdentity,
     ActorVirtualIdentity,
     PortIdentity,
     EmbeddedControlMessageIdentity,
 )
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     WorkerStateResponse,
     ControlInvocation,
     EmptyRequest,
@@ -31,12 +34,9 @@
     ControlRequest,
     EmbeddedControlMessageType,
 )
-from proto.edu.uci.ics.amber.engine.architecture.worker import (
+from proto.org.apache.texera.amber.engine.architecture.worker import (
     WorkerState,
 )
-from core.architecture.handlers.control.control_handler_base import ControlHandler
-from core.architecture.packaging.input_manager import InputManager
-from core.models.internal_queue import ECMElement
 
 
 class StartWorkerHandler(ControlHandler):
diff --git a/core/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py b/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py
rename to amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py
index 402a0bf0438..fe33b2dec0d 100644
--- a/core/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py
+++ b/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# from proto.edu.uci.ics.amber.engine.architecture.worker import UpdateExecutorV2
+# from proto.org.apache.texera.amber.engine.architecture.worker import UpdateExecutorV2
 # from core.architecture.handlers.control.control_handler_base import ControlHandler
 # from core.architecture.managers.context import Context
 #
diff --git a/core/amber/src/main/python/core/architecture/managers/__init__.py b/amber/src/main/python/core/architecture/managers/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/managers/__init__.py
rename to amber/src/main/python/core/architecture/managers/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/managers/console_message_manager.py b/amber/src/main/python/core/architecture/managers/console_message_manager.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/managers/console_message_manager.py
rename to amber/src/main/python/core/architecture/managers/console_message_manager.py
index 9184430148a..f75c74cda0f 100644
--- a/core/amber/src/main/python/core/architecture/managers/console_message_manager.py
+++ b/amber/src/main/python/core/architecture/managers/console_message_manager.py
@@ -18,7 +18,7 @@
 from typing import Iterator
 
 from core.util.buffer.timed_buffer import TimedBuffer
-from proto.edu.uci.ics.amber.engine.architecture.rpc import ConsoleMessage
+from proto.org.apache.texera.amber.engine.architecture.rpc import ConsoleMessage
 
 
 class ConsoleMessageManager:
diff --git a/core/amber/src/main/python/core/architecture/managers/context.py b/amber/src/main/python/core/architecture/managers/context.py
similarity index 95%
rename from core/amber/src/main/python/core/architecture/managers/context.py
rename to amber/src/main/python/core/architecture/managers/context.py
index 2da589ada5f..3629a435a79 100644
--- a/core/amber/src/main/python/core/architecture/managers/context.py
+++ b/amber/src/main/python/core/architecture/managers/context.py
@@ -15,19 +15,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity, ChannelIdentity
-from proto.edu.uci.ics.amber.engine.architecture.worker import WorkerState
 from typing import Optional
+
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState
 from .console_message_manager import ConsoleMessageManager
-from .embedded_control_message_manager import EmbeddedControlMessageManager
 from .debug_manager import DebugManager
+from .embedded_control_message_manager import EmbeddedControlMessageManager
 from .exception_manager import ExceptionManager
-from .state_processing_manager import StateProcessingManager
-from .tuple_processing_manager import TupleProcessingManager
 from .executor_manager import ExecutorManager
 from .pause_manager import PauseManager
 from .state_manager import StateManager
+from .state_processing_manager import StateProcessingManager
 from .statistics_manager import StatisticsManager
+from .tuple_processing_manager import TupleProcessingManager
 from ..packaging.input_manager import InputManager
 from ..packaging.output_manager import OutputManager
 from ...models import InternalQueue
diff --git a/core/amber/src/main/python/core/architecture/managers/debug_manager.py b/amber/src/main/python/core/architecture/managers/debug_manager.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/managers/debug_manager.py
rename to amber/src/main/python/core/architecture/managers/debug_manager.py
diff --git a/core/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py b/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py
similarity index 92%
rename from core/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py
rename to amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py
index ea01b24b40f..8ba80f28cef 100644
--- a/core/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py
+++ b/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py
@@ -19,8 +19,8 @@
 from typing import Set, Dict
 
 from core.architecture.packaging.input_manager import Channel
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity, ChannelIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     EmbeddedControlMessage,
     EmbeddedControlMessageType,
 )
@@ -74,9 +74,9 @@ def is_ecm_aligned(
 
         return ecm_completed
 
-    def get_channels_within_scope(
-        self, ecm: EmbeddedControlMessage
-    ) -> Dict["ChannelIdentity", "Channel"].keys:
+    def get_channels_within_scope(self, ecm: EmbeddedControlMessage) -> Dict[
+        "ChannelIdentity", "Channel"
+    ].keys:
         if ecm.scope:
             upstreams = {
                 channel_id
diff --git a/core/amber/src/main/python/core/architecture/managers/exception_manager.py b/amber/src/main/python/core/architecture/managers/exception_manager.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/managers/exception_manager.py
rename to amber/src/main/python/core/architecture/managers/exception_manager.py
diff --git a/core/amber/src/main/python/core/architecture/managers/executor_manager.py b/amber/src/main/python/core/architecture/managers/executor_manager.py
similarity index 79%
rename from core/amber/src/main/python/core/architecture/managers/executor_manager.py
rename to amber/src/main/python/core/architecture/managers/executor_manager.py
index 87333d1ce63..53e5a8903da 100644
--- a/core/amber/src/main/python/core/architecture/managers/executor_manager.py
+++ b/amber/src/main/python/core/architecture/managers/executor_manager.py
@@ -15,17 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import fs
 import importlib
 import inspect
 import sys
 from cached_property import cached_property
-
-import fs
+from fs.base import FS
+from loguru import logger
 from pathlib import Path
 from typing import Tuple, Optional
 
-from fs.base import FS
-from loguru import logger
 from core.models import Operator, SourceOperator
 
 
@@ -133,33 +132,16 @@ class declaration.
         :param language: The language of the operator code.
         :return:
         """
-        if language == "r-tuple":
-            # Have to import it here and not at the top in case R_HOME from udf.conf
-            # is not defined, otherwise an error will occur
-            # If R_HOME is not defined and rpy2 cannot find the
-            # R_HOME environment variable, an error will occur here
-            from core.models.RTupleExecutor import RTupleSourceExecutor, RTupleExecutor
-
-            self.executor = (
-                RTupleSourceExecutor(code) if is_source else RTupleExecutor(code)
-            )
-        elif language == "r-table":
-            # Have to import it here and not at the top in case R_HOME from udf.conf
-            # is not defined, otherwise an error will occur
-            # If R_HOME is not defined and rpy2 cannot find the
-            # R_HOME environment variable, an error will occur here
-            from core.models.RTableExecutor import RTableSourceExecutor, RTableExecutor
-
-            self.executor = (
-                RTableSourceExecutor(code) if is_source else RTableExecutor(code)
-            )
-        else:
-            executor: type(Operator) = self.load_executor_definition(code)
-            self.executor = executor()
-            self.executor.is_source = is_source
-        assert (
-            isinstance(self.executor, SourceOperator) == self.executor.is_source
-        ), "Please use SourceOperator API for source operators."
+        assert language not in [
+            "r-tuple",
+            "r-table",
+        ], "R language is not supported by default. Please consult third party plugin."
+        executor: type(Operator) = self.load_executor_definition(code)
+        self.executor = executor()
+        self.executor.is_source = is_source
+        assert isinstance(self.executor, SourceOperator) == self.executor.is_source, (
+            "Please use SourceOperator API for source operators."
+        )
 
     def update_executor(self, code: str, is_source: bool) -> None:
         """
@@ -175,9 +157,9 @@ class declaration.
         executor: type(Operator) = self.load_executor_definition(code)
         self.executor = executor()
         self.executor.is_source = is_source
-        assert (
-            isinstance(self.executor, SourceOperator) == self.executor.is_source
-        ), "Please use SourceOperator API for source operators."
+        assert isinstance(self.executor, SourceOperator) == self.executor.is_source, (
+            "Please use SourceOperator API for source operators."
+        )
         # overwrite the internal state
         self.executor.__dict__ = original_internal_state
         # TODO:
diff --git a/core/amber/src/main/python/core/architecture/managers/pause_manager.py b/amber/src/main/python/core/architecture/managers/pause_manager.py
similarity index 95%
rename from core/amber/src/main/python/core/architecture/managers/pause_manager.py
rename to amber/src/main/python/core/architecture/managers/pause_manager.py
index 7388a144c16..7a5cbc3824f 100644
--- a/core/amber/src/main/python/core/architecture/managers/pause_manager.py
+++ b/amber/src/main/python/core/architecture/managers/pause_manager.py
@@ -17,14 +17,12 @@
 
 from collections import defaultdict
 from enum import Enum
-
-from typing import Set, Dict
-
 from loguru import logger
+from typing import Set, Dict
 
+from proto.org.apache.texera.amber.core import ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState
 from . import state_manager
-from proto.edu.uci.ics.amber.engine.architecture.worker import WorkerState
-from proto.edu.uci.ics.amber.core import ChannelIdentity
 from ...models import InternalQueue
 
 
diff --git a/core/amber/src/main/python/core/architecture/managers/state_manager.py b/amber/src/main/python/core/architecture/managers/state_manager.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/managers/state_manager.py
rename to amber/src/main/python/core/architecture/managers/state_manager.py
diff --git a/core/amber/src/main/python/core/architecture/managers/state_processing_manager.py b/amber/src/main/python/core/architecture/managers/state_processing_manager.py
similarity index 99%
rename from core/amber/src/main/python/core/architecture/managers/state_processing_manager.py
rename to amber/src/main/python/core/architecture/managers/state_processing_manager.py
index 56f91c6b137..442b6e03564 100644
--- a/core/amber/src/main/python/core/architecture/managers/state_processing_manager.py
+++ b/amber/src/main/python/core/architecture/managers/state_processing_manager.py
@@ -16,6 +16,7 @@
 # under the License.
 
 from typing import Optional
+
 from core.models.state import State
 
 
diff --git a/core/amber/src/main/python/core/architecture/managers/statistics_manager.py b/amber/src/main/python/core/architecture/managers/statistics_manager.py
similarity index 96%
rename from core/amber/src/main/python/core/architecture/managers/statistics_manager.py
rename to amber/src/main/python/core/architecture/managers/statistics_manager.py
index d4cf6d6e363..6b36b78e577 100644
--- a/core/amber/src/main/python/core/architecture/managers/statistics_manager.py
+++ b/amber/src/main/python/core/architecture/managers/statistics_manager.py
@@ -15,11 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import DefaultDict
 from collections import defaultdict
+from typing import DefaultDict
 
-from proto.edu.uci.ics.amber.core import PortIdentity
-from proto.edu.uci.ics.amber.engine.architecture.worker import (
+from proto.org.apache.texera.amber.core import PortIdentity
+from proto.org.apache.texera.amber.engine.architecture.worker import (
     WorkerStatistics,
     PortTupleMetricsMapping,
     TupleMetrics,
diff --git a/amber/src/main/python/core/architecture/managers/test_executor_manager.py b/amber/src/main/python/core/architecture/managers/test_executor_manager.py
new file mode 100644
index 00000000000..7728c509b4d
--- /dev/null
+++ b/amber/src/main/python/core/architecture/managers/test_executor_manager.py
@@ -0,0 +1,174 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+
+from core.architecture.managers.executor_manager import ExecutorManager
+
+
+# Sample operator code for testing
+SAMPLE_OPERATOR_CODE = """
+from pytexera import *
+
+class TestOperator(UDFOperatorV2):
+    def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:
+        yield tuple_
+"""
+
+SAMPLE_SOURCE_OPERATOR_CODE = """
+from pytexera import *
+
+class TestSourceOperator(UDFSourceOperator):
+    def produce(self) -> Iterator[Union[TupleLike, TableLike, None]]:
+        yield Tuple({"test": "data"})
+"""
+
+
+class TestExecutorManager:
+    """Test suite for ExecutorManager, focusing on R UDF support removal."""
+
+    @pytest.fixture
+    def executor_manager(self):
+        """Create a fresh ExecutorManager instance for each test."""
+        manager = ExecutorManager()
+        yield manager
+        # Cleanup: close the temp filesystem
+        if hasattr(manager, "_fs"):
+            manager.close()
+
+    def test_initialization(self, executor_manager):
+        """Test that ExecutorManager initializes correctly."""
+        assert executor_manager.executor is None
+        assert executor_manager.operator_module_name is None
+        assert executor_manager.executor_version == 0
+
+    def test_reject_r_tuple_language(self, executor_manager):
+        """Test that 'r-tuple' language is rejected with AssertionError."""
+        with pytest.raises(AssertionError) as exc_info:
+            executor_manager.initialize_executor(
+                code=SAMPLE_OPERATOR_CODE, is_source=False, language="r-tuple"
+            )
+
+        # Verify the error message mentions R UDF support has been dropped
+        assert "not supported" in str(exc_info.value) or "dropped" in str(
+            exc_info.value
+        )
+
+    def test_reject_r_table_language(self, executor_manager):
+        """Test that 'r-table' language is rejected with AssertionError."""
+        with pytest.raises(AssertionError) as exc_info:
+            executor_manager.initialize_executor(
+                code=SAMPLE_OPERATOR_CODE, is_source=False, language="r-table"
+            )
+
+        # Verify the error message mentions R UDF support has been dropped
+        assert "not supported" in str(exc_info.value) or "dropped" in str(
+            exc_info.value
+        )
+
+    def test_accept_python_language_regular_operator(self, executor_manager):
+        """Test that 'python' language is accepted for regular operators."""
+        # This should not raise any assertion error
+        executor_manager.initialize_executor(
+            code=SAMPLE_OPERATOR_CODE, is_source=False, language="python"
+        )
+
+        # Verify executor was initialized
+        assert executor_manager.executor is not None
+        assert executor_manager.operator_module_name == "udf-v1"
+        assert executor_manager.executor_version == 1
+        assert executor_manager.executor.is_source is False
+
+    def test_accept_python_language_source_operator(self, executor_manager):
+        """Test that 'python' language is accepted for source operators."""
+        # This should not raise any assertion error
+        executor_manager.initialize_executor(
+            code=SAMPLE_SOURCE_OPERATOR_CODE, is_source=True, language="python"
+        )
+
+        # Verify executor was initialized
+        assert executor_manager.executor is not None
+        assert executor_manager.operator_module_name == "udf-v1"
+        assert executor_manager.executor_version == 1
+        assert executor_manager.executor.is_source is True
+
+    def test_reject_other_unsupported_languages(self, executor_manager):
+        """Test that other arbitrary languages still work (no R-specific check)."""
+        # Languages other than r-tuple and r-table should be allowed to pass
+        # the assertion, though they may fail at code execution
+        try:
+            executor_manager.initialize_executor(
+                code=SAMPLE_OPERATOR_CODE,
+                is_source=False,
+                language="javascript",  # arbitrary language
+            )
+            # If we get here, the assertion passed (which is correct behavior)
+            # But the code execution might fail, which is fine
+        except AssertionError:
+            # Should NOT raise AssertionError for non-R languages
+            pytest.fail("Should not raise AssertionError for non-R languages")
+        except Exception:
+            # Other exceptions (like import errors) are expected and acceptable
+            pass
+
+    def test_gen_module_file_name_increments(self, executor_manager):
+        """Test that module file names increment correctly."""
+        module1, file1 = executor_manager.gen_module_file_name()
+        assert module1 == "udf-v1"
+        assert file1 == "udf-v1.py"
+
+        module2, file2 = executor_manager.gen_module_file_name()
+        assert module2 == "udf-v2"
+        assert file2 == "udf-v2.py"
+
+        module3, file3 = executor_manager.gen_module_file_name()
+        assert module3 == "udf-v3"
+        assert file3 == "udf-v3.py"
+
+    def test_is_concrete_operator_static_method(self):
+        """Test the is_concrete_operator static method."""
+        from core.models import TupleOperatorV2
+
+        # Should return True for concrete operator classes
+        # Note: We can't easily test with actual concrete classes here without imports
+        # This test just verifies the method exists and is callable
+        assert hasattr(ExecutorManager, "is_concrete_operator")
+        assert callable(ExecutorManager.is_concrete_operator)
+
+        # Test with non-class
+        assert ExecutorManager.is_concrete_operator("not a class") is False
+        assert ExecutorManager.is_concrete_operator(123) is False
+
+        # Test with abstract base classes (TupleOperatorV2 has abstract methods)
+        assert ExecutorManager.is_concrete_operator(TupleOperatorV2) is False
+
+    def test_regular_operator_is_not_source(self, executor_manager):
+        """Test that regular operator with is_source=False works correctly."""
+        executor_manager.initialize_executor(
+            code=SAMPLE_OPERATOR_CODE, is_source=False, language="python"
+        )
+        assert executor_manager.executor.is_source is False
+
+    def test_source_operator_mismatch_raises_error(self, executor_manager):
+        """Test that mismatched source operator flag raises AssertionError."""
+        with pytest.raises(AssertionError) as exc_info:
+            executor_manager.initialize_executor(
+                code=SAMPLE_OPERATOR_CODE,
+                is_source=True,  # Wrong: regular operator but marked as source
+                language="python",
+            )
+        assert "SourceOperator API" in str(exc_info.value)
diff --git a/core/amber/src/main/python/core/architecture/managers/test_pause_manager.py b/amber/src/main/python/core/architecture/managers/test_pause_manager.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/managers/test_pause_manager.py
rename to amber/src/main/python/core/architecture/managers/test_pause_manager.py
index 19ad007adae..501c1335005 100644
--- a/core/amber/src/main/python/core/architecture/managers/test_pause_manager.py
+++ b/amber/src/main/python/core/architecture/managers/test_pause_manager.py
@@ -20,7 +20,7 @@
 from core.architecture.managers import StateManager
 from core.architecture.managers.pause_manager import PauseManager, PauseType
 from core.models import InternalQueue
-from proto.edu.uci.ics.amber.engine.architecture.worker import WorkerState
+from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState
 
 
 class TestPauseManager:
diff --git a/core/amber/src/main/python/core/architecture/managers/test_state_manager.py b/amber/src/main/python/core/architecture/managers/test_state_manager.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/managers/test_state_manager.py
rename to amber/src/main/python/core/architecture/managers/test_state_manager.py
index dca346d151b..9ebe6e847c8 100644
--- a/core/amber/src/main/python/core/architecture/managers/test_state_manager.py
+++ b/amber/src/main/python/core/architecture/managers/test_state_manager.py
@@ -22,7 +22,7 @@
     InvalidTransitionException,
     StateManager,
 )
-from proto.edu.uci.ics.amber.engine.architecture.worker import WorkerState
+from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState
 
 
 class TestStateManager:
diff --git a/core/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py b/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py
rename to amber/src/main/python/core/architecture/managers/tuple_processing_manager.py
index 3994bc5d156..a67949e6717 100644
--- a/core/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py
+++ b/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py
@@ -19,7 +19,7 @@
 from typing import Optional, Tuple, Iterator
 
 from core.models import InternalMarker
-from proto.edu.uci.ics.amber.core import PortIdentity
+from proto.org.apache.texera.amber.core import PortIdentity
 
 
 class TupleProcessingManager:
diff --git a/core/amber/src/main/python/core/architecture/packaging/__init__.py b/amber/src/main/python/core/architecture/packaging/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/packaging/__init__.py
rename to amber/src/main/python/core/architecture/packaging/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/packaging/input_manager.py b/amber/src/main/python/core/architecture/packaging/input_manager.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/packaging/input_manager.py
rename to amber/src/main/python/core/architecture/packaging/input_manager.py
index f0887d5e4e4..6cb6bdc08c4 100644
--- a/core/amber/src/main/python/core/architecture/packaging/input_manager.py
+++ b/amber/src/main/python/core/architecture/packaging/input_manager.py
@@ -16,20 +16,21 @@
 # under the License.
 
 import threading
-from typing import Iterator, Optional, Union, Dict, List, Set
 from pyarrow.lib import Table
+from typing import Iterator, Optional, Union, Dict, List, Set
+
 from core.models import Tuple, ArrowTableTupleProvider, Schema, InternalQueue
 from core.models.internal_marker import InternalMarker
 from core.models.payload import DataFrame, DataPayload, StateFrame
 from core.storage.runnables.input_port_materialization_reader_runnable import (
     InputPortMaterializationReaderRunnable,
 )
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     ActorVirtualIdentity,
     PortIdentity,
     ChannelIdentity,
 )
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import Partitioning
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import Partitioning
 
 
 class Channel:
@@ -155,7 +156,6 @@ def register_input(
     def process_data_payload(
         self, from_: ChannelIdentity, payload: DataPayload
     ) -> Iterator[Union[Tuple, InternalMarker]]:
-
         self._current_channel_id = from_
 
         if isinstance(payload, DataFrame):
diff --git a/core/amber/src/main/python/core/architecture/packaging/output_manager.py b/amber/src/main/python/core/architecture/packaging/output_manager.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/packaging/output_manager.py
rename to amber/src/main/python/core/architecture/packaging/output_manager.py
index f685705b403..bf4afbf396f 100644
--- a/core/amber/src/main/python/core/architecture/packaging/output_manager.py
+++ b/amber/src/main/python/core/architecture/packaging/output_manager.py
@@ -19,12 +19,12 @@
 import typing
 from collections import OrderedDict
 from itertools import chain
+from loguru import logger
+from pyarrow import Table
 from queue import Queue
 from threading import Thread
 from typing import Iterable, Iterator
-
-from loguru import logger
-from pyarrow import Table
+from typing import Union
 
 from core.architecture.packaging.input_manager import WorkerPort, Channel
 from core.architecture.sendsemantics.broad_cast_partitioner import (
@@ -42,8 +42,8 @@
     RoundRobinPartitioner,
 )
 from core.models import Tuple, Schema, StateFrame
-from core.models.state import State
 from core.models.payload import DataPayload, DataFrame
+from core.models.state import State
 from core.storage.document_factory import DocumentFactory
 from core.storage.runnables.port_storage_writer import (
     PortStorageWriter,
@@ -51,14 +51,14 @@
 )
 from core.util import get_one_of
 from core.util.virtual_identity import get_worker_index
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     ActorVirtualIdentity,
     PhysicalLink,
     PortIdentity,
     ChannelIdentity,
 )
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     HashBasedShufflePartitioning,
     OneToOnePartitioning,
     Partitioning,
@@ -66,7 +66,6 @@
     RangeBasedShufflePartitioning,
     BroadcastPartitioning,
 )
-from typing import Union
 
 
 class OutputManager:
@@ -263,7 +262,7 @@ def tuple_to_frame(self, tuples: typing.List[Tuple]) -> DataFrame:
         return DataFrame(
             frame=Table.from_pydict(
                 {
-                    name: [t[name] for t in tuples]
+                    name: [t.get_serialized_field(name) for t in tuples]
                     for name in self.get_port().get_schema().get_attr_names()
                 },
                 schema=self.get_port().get_schema().as_arrow_schema(),
diff --git a/core/amber/src/main/python/core/architecture/rpc/async_rpc_client.py b/amber/src/main/python/core/architecture/rpc/async_rpc_client.py
similarity index 97%
rename from core/amber/src/main/python/core/architecture/rpc/async_rpc_client.py
rename to amber/src/main/python/core/architecture/rpc/async_rpc_client.py
index a0824deb3b3..f11c5afdea5 100644
--- a/core/amber/src/main/python/core/architecture/rpc/async_rpc_client.py
+++ b/amber/src/main/python/core/architecture/rpc/async_rpc_client.py
@@ -26,7 +26,8 @@
 from core.architecture.managers.context import Context
 from core.models.internal_queue import InternalQueue, DCMElement
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     AsyncRpcContext,
     ReturnInvocation,
     ControlReturn,
@@ -35,8 +36,7 @@
     WorkerServiceStub,
     ControlRequest,
 )
-from proto.edu.uci.ics.amber.engine.common import DirectControlMessagePayloadV2
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2
 
 R = TypeVar("R")
 
@@ -136,7 +136,6 @@ def _create_proxy(self, service_class, target_worker: ActorVirtualIdentity):
         rpc_client = self  # to distinguish outer and inner self
 
         class Proxy(service_class):
-
             def __init__(self, target_actor: ActorVirtualIdentity):
                 self.target_actor = target_actor
 
diff --git a/core/amber/src/main/python/core/architecture/rpc/async_rpc_handler_initializer.py b/amber/src/main/python/core/architecture/rpc/async_rpc_handler_initializer.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/rpc/async_rpc_handler_initializer.py
rename to amber/src/main/python/core/architecture/rpc/async_rpc_handler_initializer.py
index ef173cceffc..c2574028a13 100644
--- a/core/amber/src/main/python/core/architecture/rpc/async_rpc_handler_initializer.py
+++ b/amber/src/main/python/core/architecture/rpc/async_rpc_handler_initializer.py
@@ -25,7 +25,6 @@
 from core.architecture.handlers.control.debug_command_handler import (
     WorkerDebugCommandHandler,
 )
-from core.architecture.handlers.control.start_channel_handler import StartChannelHandler
 from core.architecture.handlers.control.end_channel_handler import EndChannelHandler
 from core.architecture.handlers.control.end_worker_handler import EndWorkerHandler
 from core.architecture.handlers.control.evaluate_expression_handler import (
@@ -44,6 +43,7 @@
     RetryCurrentTupleHandler,
 )
 from core.architecture.handlers.control.resume_worker_handler import ResumeWorkerHandler
+from core.architecture.handlers.control.start_channel_handler import StartChannelHandler
 from core.architecture.handlers.control.start_worker_handler import StartWorkerHandler
 
 
diff --git a/core/amber/src/main/python/core/architecture/rpc/async_rpc_server.py b/amber/src/main/python/core/architecture/rpc/async_rpc_server.py
similarity index 96%
rename from core/amber/src/main/python/core/architecture/rpc/async_rpc_server.py
rename to amber/src/main/python/core/architecture/rpc/async_rpc_server.py
index 438239d3aeb..d7763070301 100644
--- a/core/amber/src/main/python/core/architecture/rpc/async_rpc_server.py
+++ b/amber/src/main/python/core/architecture/rpc/async_rpc_server.py
@@ -15,16 +15,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import asyncio
 import grpclib.const
 from loguru import logger
-import asyncio
+
 from core.architecture.managers.context import Context
 from core.architecture.rpc.async_rpc_handler_initializer import (
     AsyncRPCHandlerInitializer,
 )
 from core.models.internal_queue import InternalQueue, DCMElement
 from core.util import get_one_of, set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ReturnInvocation,
     ControlRequest,
     ControlInvocation,
@@ -32,8 +34,7 @@
     ControlError,
     ErrorLanguage,
 )
-from proto.edu.uci.ics.amber.engine.common import DirectControlMessagePayloadV2
-from proto.edu.uci.ics.amber.core import ChannelIdentity
+from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2
 
 
 class AsyncRPCServer:
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/__init__.py b/amber/src/main/python/core/architecture/sendsemantics/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/architecture/sendsemantics/__init__.py
rename to amber/src/main/python/core/architecture/sendsemantics/__init__.py
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py
rename to amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py
index e8d5eab6250..bd1b1d29ecf 100644
--- a/core/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py
+++ b/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py
@@ -16,18 +16,19 @@
 # under the License.
 
 import typing
-from typing import Iterator
 from overrides import overrides
+from typing import Iterator
+
 from core.architecture.sendsemantics.partitioner import Partitioner
 from core.models import Tuple
 from core.models.state import State
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     Partitioning,
     BroadcastPartitioning,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
 
 
 class BroadcastPartitioner(Partitioner):
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py
rename to amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py
index e4002f44f5a..de018e5a3ce 100644
--- a/core/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py
+++ b/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py
@@ -16,20 +16,20 @@
 # under the License.
 
 import typing
-from typing import Iterator
-
 from loguru import logger
 from overrides import overrides
+from typing import Iterator
+
 from core.architecture.sendsemantics.partitioner import Partitioner
 from core.models import Tuple
 from core.models.state import State
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     HashBasedShufflePartitioning,
     Partitioning,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
 
 
 class HashBasedShufflePartitioner(Partitioner):
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py
similarity index 91%
rename from core/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py
rename to amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py
index 729e6dfe001..d6a568be6a3 100644
--- a/core/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py
+++ b/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py
@@ -16,19 +16,19 @@
 # under the License.
 
 import typing
+from overrides import overrides
 from typing import Iterator
 
-from overrides import overrides
 from core.architecture.sendsemantics.partitioner import Partitioner
 from core.models import Tuple
 from core.models.state import State
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     OneToOnePartitioning,
     Partitioning,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
 
 
 class OneToOnePartitioner(Partitioner):
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/partitioner.py
similarity index 87%
rename from core/amber/src/main/python/core/architecture/sendsemantics/partitioner.py
rename to amber/src/main/python/core/architecture/sendsemantics/partitioner.py
index 421c72433d5..c4aac57cbe4 100644
--- a/core/amber/src/main/python/core/architecture/sendsemantics/partitioner.py
+++ b/amber/src/main/python/core/architecture/sendsemantics/partitioner.py
@@ -17,14 +17,15 @@
 
 import typing
 from abc import ABC
-from typing import Iterator
 from betterproto import Message
+from typing import Iterator
+
 from core.models import Tuple
 from core.models.state import State
 from core.util import get_one_of
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import Partitioning
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import Partitioning
 
 
 class Partitioner(ABC):
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py
similarity index 94%
rename from core/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py
rename to amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py
index a45811540f6..28aff35935f 100644
--- a/core/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py
+++ b/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py
@@ -16,21 +16,20 @@
 # under the License.
 
 import typing
-from typing import Iterator
-
 from loguru import logger
 from overrides import overrides
+from typing import Iterator
 
 from core.architecture.sendsemantics.partitioner import Partitioner
 from core.models import Tuple
 from core.models.state import State
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     RangeBasedShufflePartitioning,
     Partitioning,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
 
 
 class RangeBasedShufflePartitioner(Partitioner):
diff --git a/core/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py
similarity index 93%
rename from core/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py
rename to amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py
index ab5b0a69e4d..87c3fee87d8 100644
--- a/core/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py
+++ b/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py
@@ -16,18 +16,19 @@
 # under the License.
 
 import typing
-from typing import Iterator
 from overrides import overrides
+from typing import Iterator
+
 from core.architecture.sendsemantics.partitioner import Partitioner
 from core.models import Tuple
 from core.models.state import State
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     Partitioning,
     RoundRobinPartitioning,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
 
 
 class RoundRobinPartitioner(Partitioner):
diff --git a/core/amber/src/main/python/core/models/__init__.py b/amber/src/main/python/core/models/__init__.py
similarity index 97%
rename from core/amber/src/main/python/core/models/__init__.py
rename to amber/src/main/python/core/models/__init__.py
index 9011c1db887..d24fe0a277d 100644
--- a/core/amber/src/main/python/core/models/__init__.py
+++ b/amber/src/main/python/core/models/__init__.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import builtins
 from inspect import Traceback
 from typing import NamedTuple
 
@@ -36,7 +37,7 @@
 
 
 class ExceptionInfo(NamedTuple):
-    exc: type
+    exc: builtins.type
     value: Exception
     tb: Traceback
 
diff --git a/core/amber/src/main/python/core/models/batch.py b/amber/src/main/python/core/models/batch.py
similarity index 99%
rename from core/amber/src/main/python/core/models/batch.py
rename to amber/src/main/python/core/models/batch.py
index ae6c41118fe..efa8a7b0ab5 100644
--- a/core/amber/src/main/python/core/models/batch.py
+++ b/amber/src/main/python/core/models/batch.py
@@ -15,9 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import TypeVar
-
 import pandas
+from typing import TypeVar
 
 BatchLike = TypeVar("BatchLike", pandas.DataFrame, pandas.DataFrame)
 
diff --git a/core/amber/src/main/python/core/models/internal_marker.py b/amber/src/main/python/core/models/internal_marker.py
similarity index 100%
rename from core/amber/src/main/python/core/models/internal_marker.py
rename to amber/src/main/python/core/models/internal_marker.py
diff --git a/core/amber/src/main/python/core/models/internal_queue.py b/amber/src/main/python/core/models/internal_queue.py
similarity index 95%
rename from core/amber/src/main/python/core/models/internal_queue.py
rename to amber/src/main/python/core/models/internal_queue.py
index 9fbd6a18365..abc1793ff6c 100644
--- a/core/amber/src/main/python/core/models/internal_queue.py
+++ b/amber/src/main/python/core/models/internal_queue.py
@@ -28,9 +28,9 @@
     LinkedBlockingMultiQueue,
 )
 from core.util.customized_queue.queue_base import IQueue, QueueElement
-from proto.edu.uci.ics.amber.core import ChannelIdentity
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
-from proto.edu.uci.ics.amber.engine.common import DirectControlMessagePayloadV2
+from proto.org.apache.texera.amber.core import ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2
 
 
 @dataclass
@@ -57,7 +57,6 @@ class ECMElement(InternalQueueElement):
 
 
 class InternalQueue(IQueue):
-
     class DisableType(Enum):
         DISABLE_BY_PAUSE = 1
         DISABLE_BY_BACKPRESSURE = 2
diff --git a/core/amber/src/main/python/core/models/operator.py b/amber/src/main/python/core/models/operator.py
similarity index 99%
rename from core/amber/src/main/python/core/models/operator.py
rename to amber/src/main/python/core/models/operator.py
index fcbf642575b..4d3288c67a5 100644
--- a/core/amber/src/main/python/core/models/operator.py
+++ b/amber/src/main/python/core/models/operator.py
@@ -15,14 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import overrides
+import pandas
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from typing import Iterator, List, Mapping, Optional, Union, MutableMapping
 
-import overrides
-import pandas
-
-
 from . import Table, TableLike, Tuple, TupleLike, Batch, BatchLike
 from .state import State
 from .table import all_output_to_tuple
diff --git a/core/amber/src/main/python/core/models/payload.py b/amber/src/main/python/core/models/payload.py
similarity index 99%
rename from core/amber/src/main/python/core/models/payload.py
rename to amber/src/main/python/core/models/payload.py
index b003f1c3f16..61a33294882 100644
--- a/core/amber/src/main/python/core/models/payload.py
+++ b/amber/src/main/python/core/models/payload.py
@@ -17,6 +17,7 @@
 
 from dataclasses import dataclass
 from pyarrow.lib import Table
+
 from core.models.state import State
 
 
diff --git a/core/amber/src/main/python/core/models/schema/__init__.py b/amber/src/main/python/core/models/schema/__init__.py
similarity index 92%
rename from core/amber/src/main/python/core/models/schema/__init__.py
rename to amber/src/main/python/core/models/schema/__init__.py
index 7c8b57bb316..306fe4e1d4e 100644
--- a/core/amber/src/main/python/core/models/schema/__init__.py
+++ b/amber/src/main/python/core/models/schema/__init__.py
@@ -16,12 +16,14 @@
 # under the License.
 
 from .attribute_type import AttributeType
+from core.models.type.large_binary import largebinary
 from .field import Field
 from .schema import Schema
 
 
 __all__ = [
     "AttributeType",
+    "largebinary",
     "Field",
     "Schema",
 ]
diff --git a/amber/src/main/python/core/models/schema/arrow_schema_utils.py b/amber/src/main/python/core/models/schema/arrow_schema_utils.py
new file mode 100644
index 00000000000..527e0095e65
--- /dev/null
+++ b/amber/src/main/python/core/models/schema/arrow_schema_utils.py
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Utilities for converting between Arrow schemas and Amber schemas,
+handling LARGE_BINARY metadata preservation.
+"""
+
+import pyarrow as pa
+from typing import Mapping
+
+from core.models.schema.attribute_type import AttributeType
+from core.models.schema.attribute_type_utils import (
+    detect_attribute_type_from_arrow_field,
+    create_arrow_field_with_metadata,
+)
+
+
+def arrow_schema_to_attr_types(arrow_schema: pa.Schema) -> dict[str, AttributeType]:
+    """
+    Converts an Arrow schema to a dictionary of attribute name to AttributeType.
+    Handles LARGE_BINARY metadata detection.
+
+    :param arrow_schema: PyArrow schema that may contain LARGE_BINARY metadata
+    :return: Dictionary mapping attribute names to AttributeTypes
+    """
+    attr_types = {}
+    for attr_name in arrow_schema.names:
+        field = arrow_schema.field(attr_name)
+        attr_types[attr_name] = detect_attribute_type_from_arrow_field(field)
+    return attr_types
+
+
+def attr_types_to_arrow_schema(
+    attr_types: Mapping[str, AttributeType],
+) -> pa.Schema:
+    """
+    Converts a mapping of attribute name to AttributeType into an Arrow schema.
+    Adds metadata for LARGE_BINARY types.
+    Preserves the order of attributes from the input mapping.
+
+    :param attr_types: Mapping of attribute names to AttributeTypes (e.g., OrderedDict)
+    :return: PyArrow schema with metadata for LARGE_BINARY types
+    """
+    fields = [
+        create_arrow_field_with_metadata(attr_name, attr_type)
+        for attr_name, attr_type in attr_types.items()
+    ]
+    return pa.schema(fields)
diff --git a/core/amber/src/main/python/core/models/schema/attribute_type.py b/amber/src/main/python/core/models/schema/attribute_type.py
similarity index 87%
rename from core/amber/src/main/python/core/models/schema/attribute_type.py
rename to amber/src/main/python/core/models/schema/attribute_type.py
index aa6a6e65639..24d0745f41e 100644
--- a/core/amber/src/main/python/core/models/schema/attribute_type.py
+++ b/amber/src/main/python/core/models/schema/attribute_type.py
@@ -16,11 +16,11 @@
 # under the License.
 
 import datetime
-from enum import Enum
-
+import pyarrow as pa
 from bidict import bidict
+from enum import Enum
 from pyarrow import lib
-import pyarrow as pa
+from core.models.type.large_binary import largebinary
 
 
 class AttributeType(Enum):
@@ -28,7 +28,7 @@ class AttributeType(Enum):
     Types supported by PyTexera & PyAmber.
 
     The definitions are mapped and following the AttributeType.java
-    (src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeType.java)
+    (src/main/scala/org/apache/texera/workflow/common/tuple/schema/AttributeType.java)
     """
 
     STRING = 1
@@ -38,6 +38,7 @@ class AttributeType(Enum):
     DOUBLE = 5
     TIMESTAMP = 6
     BINARY = 7
+    LARGE_BINARY = 8
 
 
 RAW_TYPE_MAPPING = bidict(
@@ -49,6 +50,7 @@ class AttributeType(Enum):
         "BOOLEAN": AttributeType.BOOL,
         "TIMESTAMP": AttributeType.TIMESTAMP,
         "BINARY": AttributeType.BINARY,
+        "LARGE_BINARY": AttributeType.LARGE_BINARY,
     }
 )
 
@@ -60,6 +62,7 @@ class AttributeType(Enum):
     AttributeType.BOOL: pa.bool_(),
     AttributeType.BINARY: pa.binary(),
     AttributeType.TIMESTAMP: pa.timestamp("us"),
+    AttributeType.LARGE_BINARY: pa.string(),  # Serialized as URI string
 }
 
 FROM_ARROW_MAPPING = {
@@ -84,6 +87,7 @@ class AttributeType(Enum):
     AttributeType.BOOL: bool,
     AttributeType.BINARY: bytes,
     AttributeType.TIMESTAMP: datetime.datetime,
+    AttributeType.LARGE_BINARY: largebinary,
 }
 
 FROM_PYOBJECT_MAPPING = {
@@ -93,4 +97,5 @@ class AttributeType(Enum):
     bool: AttributeType.BOOL,
     bytes: AttributeType.BINARY,
     datetime.datetime: AttributeType.TIMESTAMP,
+    largebinary: AttributeType.LARGE_BINARY,
 }
diff --git a/amber/src/main/python/core/models/schema/attribute_type_utils.py b/amber/src/main/python/core/models/schema/attribute_type_utils.py
new file mode 100644
index 00000000000..3918fdfc342
--- /dev/null
+++ b/amber/src/main/python/core/models/schema/attribute_type_utils.py
@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Utilities for converting between AttributeTypes and Arrow field types,
+handling LARGE_BINARY metadata preservation.
+"""
+
+import pyarrow as pa
+
+from core.models.schema.attribute_type import (
+    AttributeType,
+    FROM_ARROW_MAPPING,
+    TO_ARROW_MAPPING,
+)
+
+# Metadata key used to mark LARGE_BINARY fields in Arrow schemas
+TEXERA_TYPE_METADATA_KEY = b"texera_type"
+LARGE_BINARY_METADATA_VALUE = b"LARGE_BINARY"
+
+
+def detect_attribute_type_from_arrow_field(field: pa.Field) -> AttributeType:
+    """
+    Detects the AttributeType from an Arrow field, checking metadata for LARGE_BINARY.
+
+    :param field: PyArrow field that may contain metadata
+    :return: The detected AttributeType
+    """
+    # Check metadata for LARGE_BINARY type
+    # (can be stored by either Scala ArrowUtils or Python)
+    is_large_binary = (
+        field.metadata
+        and field.metadata.get(TEXERA_TYPE_METADATA_KEY) == LARGE_BINARY_METADATA_VALUE
+    )
+
+    if is_large_binary:
+        return AttributeType.LARGE_BINARY
+    else:
+        return FROM_ARROW_MAPPING[field.type.id]
+
+
+def create_arrow_field_with_metadata(
+    attr_name: str, attr_type: AttributeType
+) -> pa.Field:
+    """
+    Creates a PyArrow field with appropriate metadata for the given AttributeType.
+
+    :param attr_name: Name of the attribute
+    :param attr_type: The AttributeType
+    :return: PyArrow field with metadata if needed
+    """
+    metadata = (
+        {TEXERA_TYPE_METADATA_KEY: LARGE_BINARY_METADATA_VALUE}
+        if attr_type == AttributeType.LARGE_BINARY
+        else None
+    )
+
+    return pa.field(attr_name, TO_ARROW_MAPPING[attr_type], metadata=metadata)
diff --git a/core/amber/src/main/python/core/models/schema/field.py b/amber/src/main/python/core/models/schema/field.py
similarity index 100%
rename from core/amber/src/main/python/core/models/schema/field.py
rename to amber/src/main/python/core/models/schema/field.py
diff --git a/core/amber/src/main/python/core/models/schema/schema.py b/amber/src/main/python/core/models/schema/schema.py
similarity index 92%
rename from core/amber/src/main/python/core/models/schema/schema.py
rename to amber/src/main/python/core/models/schema/schema.py
index a2c8bdb56cd..d349807ab79 100644
--- a/core/amber/src/main/python/core/models/schema/schema.py
+++ b/amber/src/main/python/core/models/schema/schema.py
@@ -15,16 +15,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import pyarrow as pa
 from collections import OrderedDict
 from typing import MutableMapping, Optional, Mapping, List, Tuple
 
-import pyarrow as pa
-
 from core.models.schema.attribute_type import (
     AttributeType,
     RAW_TYPE_MAPPING,
-    FROM_ARROW_MAPPING,
-    TO_ARROW_MAPPING,
+)
+from core.models.schema.arrow_schema_utils import (
+    arrow_schema_to_attr_types,
+    attr_types_to_arrow_schema,
 )
 
 
@@ -86,22 +87,17 @@ def _from_arrow_schema(self, arrow_schema: pa.Schema) -> None:
         :return:
         """
         self._name_type_mapping = OrderedDict()
+        attr_types = arrow_schema_to_attr_types(arrow_schema)
+        # Preserve field order from arrow_schema
         for attr_name in arrow_schema.names:
-            arrow_type = arrow_schema.field(attr_name).type  # type: ignore
-            attr_type = FROM_ARROW_MAPPING[arrow_type.id]
-            self.add(attr_name, attr_type)
+            self.add(attr_name, attr_types[attr_name])
 
     def as_arrow_schema(self) -> pa.Schema:
         """
         Creates a new pyarrow.Schema according to the current Schema.
         :return: pyarrow.Schema
         """
-        return pa.schema(
-            [
-                pa.field(attr_name, TO_ARROW_MAPPING[attr_type])
-                for attr_name, attr_type in self._name_type_mapping.items()
-            ]
-        )
+        return attr_types_to_arrow_schema(self._name_type_mapping)
 
     def get_attr_names(self) -> List[str]:
         """
diff --git a/core/amber/src/main/python/core/models/schema/test_schema.py b/amber/src/main/python/core/models/schema/test_schema.py
similarity index 54%
rename from core/amber/src/main/python/core/models/schema/test_schema.py
rename to amber/src/main/python/core/models/schema/test_schema.py
index b36fd277fe4..60e4c848a54 100644
--- a/core/amber/src/main/python/core/models/schema/test_schema.py
+++ b/amber/src/main/python/core/models/schema/test_schema.py
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import pytest
 import pyarrow as pa
+import pytest
 
 from core.models.schema.attribute_type import AttributeType
 from core.models.schema.schema import Schema
@@ -89,3 +89,68 @@ def test_convert_from_raw_schema(self, raw_schema, schema):
     def test_convert_from_arrow_schema(self, arrow_schema, schema):
         assert schema == Schema(arrow_schema=arrow_schema)
         assert schema.as_arrow_schema() == arrow_schema
+
+    def test_large_binary_in_raw_schema(self):
+        """Test creating schema with LARGE_BINARY from raw schema."""
+        raw_schema = {
+            "regular_field": "STRING",
+            "large_binary_field": "LARGE_BINARY",
+        }
+        schema = Schema(raw_schema=raw_schema)
+        assert schema.get_attr_type("regular_field") == AttributeType.STRING
+        assert schema.get_attr_type("large_binary_field") == AttributeType.LARGE_BINARY
+
+    def test_large_binary_in_arrow_schema_with_metadata(self):
+        """Test creating schema with LARGE_BINARY from Arrow schema with metadata."""
+        arrow_schema = pa.schema(
+            [
+                pa.field("regular_field", pa.string()),
+                pa.field(
+                    "large_binary_field",
+                    pa.string(),
+                    metadata={b"texera_type": b"LARGE_BINARY"},
+                ),
+            ]
+        )
+        schema = Schema(arrow_schema=arrow_schema)
+        assert schema.get_attr_type("regular_field") == AttributeType.STRING
+        assert schema.get_attr_type("large_binary_field") == AttributeType.LARGE_BINARY
+
+    def test_large_binary_as_arrow_schema_includes_metadata(self):
+        """Test that LARGE_BINARY fields include metadata in Arrow schema."""
+        schema = Schema()
+        schema.add("regular_field", AttributeType.STRING)
+        schema.add("large_binary_field", AttributeType.LARGE_BINARY)
+
+        arrow_schema = schema.as_arrow_schema()
+
+        # Regular field should have no metadata
+        regular_field = arrow_schema.field("regular_field")
+        assert (
+            regular_field.metadata is None
+            or b"texera_type" not in regular_field.metadata
+        )
+
+        # LARGE_BINARY field should have metadata
+        large_binary_field = arrow_schema.field("large_binary_field")
+        assert large_binary_field.metadata is not None
+        assert large_binary_field.metadata.get(b"texera_type") == b"LARGE_BINARY"
+        assert (
+            large_binary_field.type == pa.string()
+        )  # LARGE_BINARY is stored as string
+
+    def test_round_trip_large_binary_schema(self):
+        """Test round-trip conversion of schema with LARGE_BINARY."""
+        original_schema = Schema()
+        original_schema.add("field1", AttributeType.STRING)
+        original_schema.add("field2", AttributeType.LARGE_BINARY)
+        original_schema.add("field3", AttributeType.INT)
+
+        # Convert to Arrow and back
+        arrow_schema = original_schema.as_arrow_schema()
+        round_trip_schema = Schema(arrow_schema=arrow_schema)
+
+        assert round_trip_schema == original_schema
+        assert round_trip_schema.get_attr_type("field1") == AttributeType.STRING
+        assert round_trip_schema.get_attr_type("field2") == AttributeType.LARGE_BINARY
+        assert round_trip_schema.get_attr_type("field3") == AttributeType.INT
diff --git a/core/amber/src/main/python/core/models/single_blocking_io.py b/amber/src/main/python/core/models/single_blocking_io.py
similarity index 100%
rename from core/amber/src/main/python/core/models/single_blocking_io.py
rename to amber/src/main/python/core/models/single_blocking_io.py
diff --git a/core/amber/src/main/python/core/models/state.py b/amber/src/main/python/core/models/state.py
similarity index 99%
rename from core/amber/src/main/python/core/models/state.py
rename to amber/src/main/python/core/models/state.py
index ba347a7e0b4..2c8a268dfb7 100644
--- a/core/amber/src/main/python/core/models/state.py
+++ b/amber/src/main/python/core/models/state.py
@@ -19,6 +19,7 @@
 from pandas import DataFrame
 from pyarrow import Table
 from typing import Optional
+
 from .schema import Schema, AttributeType
 from .schema.attribute_type import FROM_PYOBJECT_MAPPING
 
diff --git a/core/amber/src/main/python/core/models/table.py b/amber/src/main/python/core/models/table.py
similarity index 99%
rename from core/amber/src/main/python/core/models/table.py
rename to amber/src/main/python/core/models/table.py
index 3f3a1fdac09..4716e0eba06 100644
--- a/core/amber/src/main/python/core/models/table.py
+++ b/amber/src/main/python/core/models/table.py
@@ -15,14 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Iterator, TypeVar, List
-
-from pampy import match
 import pandas
+from pampy import match
+from typing import Iterator, TypeVar, List
 
 from core.models import Tuple, TupleLike
 
-
 TableLike = TypeVar("TableLike", pandas.DataFrame, List[TupleLike])
 
 
diff --git a/core/amber/src/main/python/core/models/test_table.py b/amber/src/main/python/core/models/test_table.py
similarity index 99%
rename from core/amber/src/main/python/core/models/test_table.py
rename to amber/src/main/python/core/models/test_table.py
index 55fcb87db95..368220779d5 100644
--- a/core/amber/src/main/python/core/models/test_table.py
+++ b/amber/src/main/python/core/models/test_table.py
@@ -16,9 +16,8 @@
 # under the License.
 
 import datetime
-import pickle
-
 import pandas
+import pickle
 import pytest
 from pandas import RangeIndex
 
diff --git a/core/amber/src/main/python/core/models/test_tuple.py b/amber/src/main/python/core/models/test_tuple.py
similarity index 69%
rename from core/amber/src/main/python/core/models/test_tuple.py
rename to amber/src/main/python/core/models/test_tuple.py
index 450d7d267bc..efb4fdf5c71 100644
--- a/core/amber/src/main/python/core/models/test_tuple.py
+++ b/amber/src/main/python/core/models/test_tuple.py
@@ -16,12 +16,11 @@
 # under the License.
 
 import datetime
-
 import pandas
+import pyarrow
 import pytest
+import numpy as np
 from copy import deepcopy
-import pyarrow
-from numpy import NaN
 
 from core.models import Tuple, ArrowTableTupleProvider
 from core.models.schema.schema import Schema
@@ -124,7 +123,7 @@ def test_retrieve_tuple_from_empty_arrow_table(self):
 
     def test_finalize_tuple(self):
         tuple_ = Tuple(
-            {"name": "texera", "age": 21, "scores": [85, 94, 100], "height": NaN}
+            {"name": "texera", "age": 21, "scores": [85, 94, 100], "height": np.nan}
         )
         schema = Schema(
             raw_schema={
@@ -222,3 +221,101 @@ def test_hash(self):
             schema,
         )
         assert hash(tuple5) == -2099556631  # calculated with Java
+
+    def test_tuple_with_large_binary(self):
+        """Test tuple with largebinary field."""
+        from core.models.type.large_binary import largebinary
+
+        schema = Schema(
+            raw_schema={
+                "regular_field": "STRING",
+                "large_binary_field": "LARGE_BINARY",
+            }
+        )
+
+        large_binary = largebinary("s3://test-bucket/path/to/object")
+        tuple_ = Tuple(
+            {
+                "regular_field": "test string",
+                "large_binary_field": large_binary,
+            },
+            schema=schema,
+        )
+
+        assert tuple_["regular_field"] == "test string"
+        assert tuple_["large_binary_field"] == large_binary
+        assert isinstance(tuple_["large_binary_field"], largebinary)
+        assert tuple_["large_binary_field"].uri == "s3://test-bucket/path/to/object"
+
+    def test_tuple_from_arrow_with_large_binary(self):
+        """Test creating tuple from Arrow table with LARGE_BINARY metadata."""
+        import pyarrow as pa
+        from core.models.type.large_binary import largebinary
+
+        # Create Arrow schema with LARGE_BINARY metadata
+        arrow_schema = pa.schema(
+            [
+                pa.field("regular_field", pa.string()),
+                pa.field(
+                    "large_binary_field",
+                    pa.string(),
+                    metadata={b"texera_type": b"LARGE_BINARY"},
+                ),
+            ]
+        )
+
+        # Create Arrow table with URI string for large_binary_field
+        arrow_table = pa.Table.from_pydict(
+            {
+                "regular_field": ["test"],
+                "large_binary_field": ["s3://test-bucket/path/to/object"],
+            },
+            schema=arrow_schema,
+        )
+
+        # Create tuple from Arrow table
+        tuple_provider = ArrowTableTupleProvider(arrow_table)
+        tuples = [
+            Tuple({name: field_accessor for name in arrow_table.column_names})
+            for field_accessor in tuple_provider
+        ]
+
+        assert len(tuples) == 1
+        tuple_ = tuples[0]
+        assert tuple_["regular_field"] == "test"
+        assert isinstance(tuple_["large_binary_field"], largebinary)
+        assert tuple_["large_binary_field"].uri == "s3://test-bucket/path/to/object"
+
+    def test_tuple_with_null_large_binary(self):
+        """Test tuple with null largebinary field."""
+        import pyarrow as pa
+
+        # Create Arrow schema with LARGE_BINARY metadata
+        arrow_schema = pa.schema(
+            [
+                pa.field(
+                    "large_binary_field",
+                    pa.string(),
+                    metadata={b"texera_type": b"LARGE_BINARY"},
+                ),
+            ]
+        )
+
+        # Create Arrow table with null value
+        arrow_table = pa.Table.from_pydict(
+            {
+                "large_binary_field": [None],
+            },
+            schema=arrow_schema,
+        )
+
+        # Create tuple from Arrow table
+        tuple_provider = ArrowTableTupleProvider(arrow_table)
+        tuples = [
+            Tuple({name: field_accessor for name in arrow_table.column_names})
+            for field_accessor in tuple_provider
+        ]
+
+        assert len(tuples) == 1
+        tuple_ = tuples[0]
+        assert tuple_["large_binary_field"] is None
diff --git a/core/amber/src/main/python/core/models/tuple.py b/amber/src/main/python/core/models/tuple.py
similarity index 91%
rename from core/amber/src/main/python/core/models/tuple.py
rename to amber/src/main/python/core/models/tuple.py
index cc7d2748253..916301406f5 100644
--- a/core/amber/src/main/python/core/models/tuple.py
+++ b/amber/src/main/python/core/models/tuple.py
@@ -16,20 +16,20 @@
 # under the License.
 
 import ctypes
+import pandas
+import pickle
+import pyarrow
 import struct
 import typing
 from collections import OrderedDict
 from copy import deepcopy
-from typing import Any, List, Iterator, Callable
-
-from typing_extensions import Protocol, runtime_checkable
-import pandas
-import pickle
-import pyarrow
 from loguru import logger
 from pandas._libs.missing import checknull
 from pympler import asizeof
+from typing import Any, List, Iterator, Callable
+from typing_extensions import Protocol, runtime_checkable
 
+from core.models.type.large_binary import largebinary
 from .schema.attribute_type import TO_PYOBJECT_MAPPING, AttributeType
 from .schema.field import Field
 from .schema.schema import Schema
@@ -87,6 +87,7 @@ def field_accessor(field_name: str) -> Field:
             """
             value = self._table.column(field_name).chunks[chunk_idx][tuple_idx].as_py()
             field_type = self._table.schema.field(field_name).type
+            field_metadata = self._table.schema.field(field_name).metadata
 
             # for binary types, convert pickled objects back.
             if (
@@ -95,6 +96,16 @@ def field_accessor(field_name: str) -> Field:
                 and value[:6] == b"pickle"
             ):
                 value = pickle.loads(value[10:])
+
+            # Convert URI string to largebinary for LARGE_BINARY types
+            # Metadata is set by Scala ArrowUtils or Python iceberg_utils
+            elif (
+                value is not None
+                and field_metadata
+                and field_metadata.get(b"texera_type") == b"LARGE_BINARY"
+            ):
+                value = largebinary(value)
+
             return value
 
         self._current_idx += 1
@@ -190,9 +201,9 @@ def __getitem__(self, item: typing.Union[int, str]) -> Field:
         :param item: field name or field index
         :return: field value
         """
-        assert isinstance(
-            item, (int, str)
-        ), "field can only be retrieved by index or name"
+        assert isinstance(item, (int, str)), (
+            "field can only be retrieved by index or name"
+        )
 
         if isinstance(item, int):
             item: str = self.get_field_names()[item]
@@ -235,6 +246,27 @@ def as_dict(self) -> "OrderedDict[str, Field]":
     def as_key_value_pairs(self) -> List[typing.Tuple[str, Field]]:
         return [(k, v) for k, v in self.as_dict().items()]
 
+    def get_serialized_field(self, field_name: str) -> Field:
+        """
+        Get a field value serialized for Arrow table conversion.
+        For LARGE_BINARY fields, converts largebinary instances to URI strings.
+        For other fields, returns the value as-is.
+
+        :param field_name: field name
+        :return: field value (URI string for LARGE_BINARY fields with largebinary values)
+        """
+        value = self[field_name]
+
+        # Convert largebinary to URI string for LARGE_BINARY fields when schema available
+        if (
+            self._schema is not None
+            and self._schema.get_attr_type(field_name) == AttributeType.LARGE_BINARY
+            and isinstance(value, largebinary)
+        ):
+            return value.uri
+
+        return value
+
     def get_field_names(self) -> typing.Tuple[str]:
         return tuple(map(str, self._field_data.keys()))
 
diff --git a/core/scripts/gui.sh b/amber/src/main/python/core/models/type/__init__.py
old mode 100755
new mode 100644
similarity index 92%
rename from core/scripts/gui.sh
rename to amber/src/main/python/core/models/type/__init__.py
index 0c6ceb2b56f..41344433aab
--- a/core/scripts/gui.sh
+++ b/amber/src/main/python/core/models/type/__init__.py
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd gui
-yarn install
-yarn run build
+from .large_binary import largebinary
+
+__all__ = ["largebinary"]
diff --git a/amber/src/main/python/core/models/type/large_binary.py b/amber/src/main/python/core/models/type/large_binary.py
new file mode 100644
index 00000000000..581a688912b
--- /dev/null
+++ b/amber/src/main/python/core/models/type/large_binary.py
@@ -0,0 +1,98 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+largebinary represents a reference to a large object stored externally (e.g., S3).
+This is a schema type class used throughout the system for handling
+LARGE_BINARY attribute types.
+"""
+
+from typing import Optional
+from urllib.parse import urlparse
+
+
+class largebinary:
+    """
+    largebinary represents a reference to a large object stored in S3.
+
+    Each largebinary is identified by an S3 URI (s3://bucket/path/to/object).
+    largebinary objects are automatically tracked and cleaned up when the workflow
+    execution completes.
+
+    Usage:
+      from pytexera import largebinary, LargeBinaryInputStream, LargeBinaryOutputStream
+
+      # Create a new largebinary for writing
+      large_binary = largebinary()
+      with LargeBinaryOutputStream(large_binary) as out:
+          out.write(b"data")
+      # large_binary is now ready to be added to tuples
+
+      # Read from an existing largebinary
+      with LargeBinaryInputStream(large_binary) as stream:
+          content = stream.read()
+
+      # Create from existing URI (e.g., from deserialization)
+      large_binary = largebinary("s3://bucket/path/to/object")
+    """
+
+    def __init__(self, uri: Optional[str] = None):
+        """
+        Create a largebinary.
+
+        Args:
+            uri: Optional S3 URI in the format s3://bucket/path/to/object.
+                 If None, creates a new largebinary with a unique S3 URI.
+
+        Raises:
+            ValueError: If URI is provided but doesn't start with "s3://"
+        """
+        if uri is None:
+            # Lazy import to avoid circular dependencies
+            from pytexera.storage import large_binary_manager
+
+            uri = large_binary_manager.create()
+
+        if not uri.startswith("s3://"):
+            raise ValueError(f"largebinary URI must start with 's3://', got: {uri}")
+
+        self._uri = uri
+
+    @property
+    def uri(self) -> str:
+        """Get the S3 URI of this largebinary."""
+        return self._uri
+
+    def get_bucket_name(self) -> str:
+        """Get the S3 bucket name from the URI."""
+        return urlparse(self._uri).netloc
+
+    def get_object_key(self) -> str:
+        """Get the S3 object key (path) from the URI, without leading slash."""
+        return urlparse(self._uri).path.lstrip("/")
+
+    def __str__(self) -> str:
+        return self._uri
+
+    def __repr__(self) -> str:
+        return f"largebinary('{self._uri}')"
+
+    def __eq__(self, other) -> bool:
+        return isinstance(other, largebinary) and self._uri == other._uri
+
+    def __hash__(self) -> int:
+        return hash(self._uri)
diff --git a/amber/src/main/python/core/models/type/test_large_binary.py b/amber/src/main/python/core/models/type/test_large_binary.py
new file mode 100644
index 00000000000..36310e1dd53
--- /dev/null
+++ b/amber/src/main/python/core/models/type/test_large_binary.py
@@ -0,0 +1,88 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+from unittest.mock import patch
+from core.models.type.large_binary import largebinary
+
+
+class TestLargeBinary:
+    def test_create_with_uri(self):
+        """Test creating largebinary with a valid S3 URI."""
+        uri = "s3://test-bucket/path/to/object"
+        large_binary = largebinary(uri)
+        assert large_binary.uri == uri
+        assert str(large_binary) == uri
+        assert repr(large_binary) == f"largebinary('{uri}')"
+
+    def test_create_without_uri(self):
+        """Test creating largebinary without URI (calls large_binary_manager.create)."""
+        with patch("pytexera.storage.large_binary_manager.create") as mock_create:
+            mock_create.return_value = "s3://bucket/objects/123/uuid"
+            large_binary = largebinary()
+            assert large_binary.uri == "s3://bucket/objects/123/uuid"
+            mock_create.assert_called_once()
+
+    def test_invalid_uri_raises_value_error(self):
+        """Test that invalid URI (not starting with s3://) raises ValueError."""
+        with pytest.raises(ValueError, match="largebinary URI must start with 's3://'"):
+            largebinary("http://invalid-uri")
+
+        with pytest.raises(ValueError, match="largebinary URI must start with 's3://'"):
+            largebinary("invalid-uri")
+
+    def test_get_bucket_name(self):
+        """Test extracting bucket name from URI."""
+        large_binary = largebinary("s3://my-bucket/path/to/object")
+        assert large_binary.get_bucket_name() == "my-bucket"
+
+    def test_get_object_key(self):
+        """Test extracting object key from URI."""
+        large_binary = largebinary("s3://my-bucket/path/to/object")
+        assert large_binary.get_object_key() == "path/to/object"
+
+    def test_get_object_key_with_leading_slash(self):
+        """Test extracting object key when URI has leading slash."""
+        large_binary = largebinary("s3://my-bucket/path/to/object")
+        # urlparse includes leading slash, but get_object_key removes it
+        assert large_binary.get_object_key() == "path/to/object"
+
+    def test_equality(self):
+        """Test largebinary equality comparison."""
+        uri = "s3://bucket/path"
+        obj1 = largebinary(uri)
+        obj2 = largebinary(uri)
+        obj3 = largebinary("s3://bucket/different")
+
+        assert obj1 == obj2
+        assert obj1 != obj3
+        assert obj1 != "not a largebinary"
+
+    def test_hash(self):
+        """Test largebinary hashing."""
+        uri = "s3://bucket/path"
+        obj1 = largebinary(uri)
+        obj2 = largebinary(uri)
+
+        assert hash(obj1) == hash(obj2)
+        assert hash(obj1) == hash(uri)
+
+    def test_uri_property(self):
+        """Test URI property access."""
+        uri = "s3://test-bucket/test/path"
+        large_binary = largebinary(uri)
+        assert large_binary.uri == uri
diff --git a/core/amber/src/main/python/core/proxy/__init__.py b/amber/src/main/python/core/proxy/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/proxy/__init__.py
rename to amber/src/main/python/core/proxy/__init__.py
diff --git a/core/amber/src/main/python/core/proxy/proxy_client.py b/amber/src/main/python/core/proxy/proxy_client.py
similarity index 100%
rename from core/amber/src/main/python/core/proxy/proxy_client.py
rename to amber/src/main/python/core/proxy/proxy_client.py
diff --git a/core/amber/src/main/python/core/proxy/proxy_server.py b/amber/src/main/python/core/proxy/proxy_server.py
similarity index 99%
rename from core/amber/src/main/python/core/proxy/proxy_server.py
rename to amber/src/main/python/core/proxy/proxy_server.py
index fb69b16bd54..b3bc3afea06 100644
--- a/core/amber/src/main/python/core/proxy/proxy_server.py
+++ b/amber/src/main/python/core/proxy/proxy_server.py
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import socket
 import threading
 from functools import wraps
 from inspect import signature
-from typing import Callable, Dict, Iterator, Optional, Tuple
-
 from loguru import logger
 from overrides import overrides
 from pyarrow import Table, py_buffer, Buffer
@@ -32,8 +31,7 @@
     Result,
     ServerCallContext,
 )
-
-import socket
+from typing import Callable, Dict, Iterator, Optional, Tuple
 
 
 def get_free_local_port():
diff --git a/core/amber/src/main/python/core/proxy/test_proxy_client.py b/amber/src/main/python/core/proxy/test_proxy_client.py
similarity index 99%
rename from core/amber/src/main/python/core/proxy/test_proxy_client.py
rename to amber/src/main/python/core/proxy/test_proxy_client.py
index 8dbf2d5cf94..b28b2cfe999 100644
--- a/core/amber/src/main/python/core/proxy/test_proxy_client.py
+++ b/amber/src/main/python/core/proxy/test_proxy_client.py
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from queue import Queue
-
 import pytest
 from pandas import DataFrame
 from pyarrow import ArrowNotImplementedError, Table
+from queue import Queue
 
 from .proxy_client import ProxyClient
 from .proxy_server import ProxyServer
diff --git a/core/amber/src/main/python/core/proxy/test_proxy_server.py b/amber/src/main/python/core/proxy/test_proxy_server.py
similarity index 100%
rename from core/amber/src/main/python/core/proxy/test_proxy_server.py
rename to amber/src/main/python/core/proxy/test_proxy_server.py
diff --git a/core/amber/src/main/python/core/python_worker.py b/amber/src/main/python/core/python_worker.py
similarity index 100%
rename from core/amber/src/main/python/core/python_worker.py
rename to amber/src/main/python/core/python_worker.py
diff --git a/core/amber/src/main/python/core/runnables/__init__.py b/amber/src/main/python/core/runnables/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/runnables/__init__.py
rename to amber/src/main/python/core/runnables/__init__.py
diff --git a/core/amber/src/main/python/core/runnables/data_processor.py b/amber/src/main/python/core/runnables/data_processor.py
similarity index 99%
rename from core/amber/src/main/python/core/runnables/data_processor.py
rename to amber/src/main/python/core/runnables/data_processor.py
index 7130c7676b8..4399b1a3a2f 100644
--- a/core/amber/src/main/python/core/runnables/data_processor.py
+++ b/amber/src/main/python/core/runnables/data_processor.py
@@ -18,10 +18,10 @@
 import os
 import sys
 import traceback
-from threading import Event
-
 from loguru import logger
+from threading import Event
 from typing import Iterator, Optional
+
 from core.architecture.managers import Context
 from core.models import ExceptionInfo, State, TupleLike, InternalMarker
 from core.models.internal_marker import StartChannel, EndChannel
@@ -30,7 +30,7 @@
 from core.util.console_message.replace_print import replace_print
 from core.util.console_message.timestamp import current_time_in_local_timezone
 from core.util.runnable.runnable import Runnable
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ConsoleMessage,
     ConsoleMessageType,
 )
diff --git a/core/amber/src/main/python/core/runnables/heartbeat.py b/amber/src/main/python/core/runnables/heartbeat.py
similarity index 99%
rename from core/amber/src/main/python/core/runnables/heartbeat.py
rename to amber/src/main/python/core/runnables/heartbeat.py
index b966a86d172..9199518f3f4 100644
--- a/core/amber/src/main/python/core/runnables/heartbeat.py
+++ b/amber/src/main/python/core/runnables/heartbeat.py
@@ -15,19 +15,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import os
+import psutil
+import signal
+import socket
+import urllib.parse
+from loguru import logger
 from overrides import overrides
 from threading import Event
-from loguru import logger
 
 from core.util.runnable.runnable import Runnable
 from core.util.stoppable.stoppable import Stoppable
 
-import os
-import signal
-import psutil
-import socket
-import urllib.parse
-
 
 class Heartbeat(Runnable, Stoppable):
     def __init__(
diff --git a/core/amber/src/main/python/core/runnables/main_loop.py b/amber/src/main/python/core/runnables/main_loop.py
similarity index 98%
rename from core/amber/src/main/python/core/runnables/main_loop.py
rename to amber/src/main/python/core/runnables/main_loop.py
index 5ec02e81f56..d73c655734f 100644
--- a/core/amber/src/main/python/core/runnables/main_loop.py
+++ b/amber/src/main/python/core/runnables/main_loop.py
@@ -43,7 +43,13 @@
 from core.util import StoppableQueueBlockingRunnable, get_one_of
 from core.util.console_message.timestamp import current_time_in_local_timezone
 from core.util.customized_queue.queue_base import QueueElement
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import (
+    ActorVirtualIdentity,
+    PortIdentity,
+    ChannelIdentity,
+    EmbeddedControlMessageIdentity,
+)
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ConsoleMessage,
     ControlInvocation,
     ConsoleMessageType,
@@ -56,15 +62,9 @@
     AsyncRpcContext,
     ControlRequest,
 )
-from proto.edu.uci.ics.amber.engine.architecture.worker import (
+from proto.org.apache.texera.amber.engine.architecture.worker import (
     WorkerState,
 )
-from proto.edu.uci.ics.amber.core import (
-    ActorVirtualIdentity,
-    PortIdentity,
-    ChannelIdentity,
-    EmbeddedControlMessageIdentity,
-)
 
 
 class MainLoop(StoppableQueueBlockingRunnable):
@@ -296,7 +296,7 @@ def _process_ecm(self, ecm_element: ECMElement):
         command = ecm.command_mapping.get(self.context.worker_id)
         channel_id = self.context.current_input_channel_id
         logger.info(
-            f"receive channel ECM from {channel_id}," f" id = {ecm.id}, cmd = {command}"
+            f"receive channel ECM from {channel_id}, id = {ecm.id}, cmd = {command}"
         )
         if ecm.ecm_type != EmbeddedControlMessageType.NO_ALIGNMENT:
             self.context.pause_manager.pause_input_channel(
@@ -305,8 +305,7 @@ def _process_ecm(self, ecm_element: ECMElement):
 
         if self.context.ecm_manager.is_ecm_aligned(channel_id, ecm):
             logger.info(
-                f"process channel ECM from {channel_id},"
-                f" id = {ecm.id}, cmd = {command}"
+                f"process channel ECM from {channel_id}, id = {ecm.id}, cmd = {command}"
             )
 
             if command is not None:
@@ -431,7 +430,6 @@ def _scheduler_time_slot_event(self, time_slot_expired: bool) -> None:
             )
 
     def _send_console_message(self, console_message: ConsoleMessage):
-
         self._async_rpc_client.controller_stub().console_message_triggered(
             ConsoleMessageTriggeredRequest(console_message=console_message)
         )
diff --git a/core/amber/src/main/python/core/runnables/network_receiver.py b/amber/src/main/python/core/runnables/network_receiver.py
similarity index 97%
rename from core/amber/src/main/python/core/runnables/network_receiver.py
rename to amber/src/main/python/core/runnables/network_receiver.py
index 45acfa945d0..fd42a8f589b 100644
--- a/core/amber/src/main/python/core/runnables/network_receiver.py
+++ b/amber/src/main/python/core/runnables/network_receiver.py
@@ -17,9 +17,9 @@
 
 from loguru import logger
 from overrides import overrides
+from pampy import match
 from pyarrow.lib import Table
 from typing import Optional
-from pampy import match
 
 from core.architecture.handlers.actorcommand.actor_handler_base import (
     ActorCommandHandler,
@@ -44,8 +44,8 @@
 from core.proxy import ProxyServer
 from core.util import Stoppable, get_one_of
 from core.util.runnable.runnable import Runnable
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
-from proto.edu.uci.ics.amber.engine.common import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.common import (
     PythonControlMessage,
     PythonDataHeader,
     PythonActorMessage,
diff --git a/core/amber/src/main/python/core/runnables/network_sender.py b/amber/src/main/python/core/runnables/network_sender.py
similarity index 95%
rename from core/amber/src/main/python/core/runnables/network_sender.py
rename to amber/src/main/python/core/runnables/network_sender.py
index c4234dd1245..9595433fb70 100644
--- a/core/amber/src/main/python/core/runnables/network_sender.py
+++ b/amber/src/main/python/core/runnables/network_sender.py
@@ -15,13 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Optional
-
+import pyarrow as pa
 from loguru import logger
 from overrides import overrides
-import pyarrow as pa
-from core.models import DataPayload, InternalQueue, DataFrame, StateFrame, State
+from typing import Optional
 
+from core.models import DataPayload, InternalQueue, DataFrame, StateFrame, State
 from core.models.internal_queue import (
     InternalQueueElement,
     DataElement,
@@ -30,13 +29,13 @@
 )
 from core.proxy import ProxyClient
 from core.util import StoppableQueueBlockingRunnable
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EmbeddedControlMessage
-from proto.edu.uci.ics.amber.engine.common import (
+from proto.org.apache.texera.amber.core import ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage
+from proto.org.apache.texera.amber.engine.common import (
     DirectControlMessagePayloadV2,
     PythonControlMessage,
     PythonDataHeader,
 )
-from proto.edu.uci.ics.amber.core import ChannelIdentity
 
 
 class NetworkSender(StoppableQueueBlockingRunnable):
diff --git a/core/amber/src/main/python/core/runnables/test_console_message.py b/amber/src/main/python/core/runnables/test_console_message.py
similarity index 93%
rename from core/amber/src/main/python/core/runnables/test_console_message.py
rename to amber/src/main/python/core/runnables/test_console_message.py
index 77b7d39049a..fbe9041f96d 100644
--- a/core/amber/src/main/python/core/runnables/test_console_message.py
+++ b/amber/src/main/python/core/runnables/test_console_message.py
@@ -15,22 +15,23 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import pytest
 import datetime
+import pytest
+
 from core.models.internal_queue import InternalQueue
-from core.util.buffer.timed_buffer import TimedBuffer
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from core.util.buffer.timed_buffer import TimedBuffer
+from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ControlInvocation,
     ControlRequest,
     ConsoleMessage,
     ConsoleMessageType,
 )
-from proto.edu.uci.ics.amber.engine.common import (
+from proto.org.apache.texera.amber.engine.common import (
     DirectControlMessagePayloadV2,
     PythonControlMessage,
 )
-from proto.edu.uci.ics.amber.core import ActorVirtualIdentity, ChannelIdentity
 
 
 class TestConsoleMessage:
diff --git a/core/amber/src/main/python/core/runnables/test_main_loop.py b/amber/src/main/python/core/runnables/test_main_loop.py
similarity index 99%
rename from core/amber/src/main/python/core/runnables/test_main_loop.py
rename to amber/src/main/python/core/runnables/test_main_loop.py
index 27ebad8383d..5ad0afec9bc 100644
--- a/core/amber/src/main/python/core/runnables/test_main_loop.py
+++ b/amber/src/main/python/core/runnables/test_main_loop.py
@@ -16,12 +16,11 @@
 # under the License.
 
 import inspect
-import pickle
-from threading import Thread
-
 import pandas
+import pickle
 import pyarrow
 import pytest
+from threading import Thread
 
 from core.models import (
     DataFrame,
@@ -35,7 +34,7 @@
 )
 from core.runnables import MainLoop
 from core.util import set_one_of
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     ActorVirtualIdentity,
     PhysicalLink,
     PhysicalOpIdentity,
@@ -46,7 +45,7 @@
     OpExecInitInfo,
     EmbeddedControlMessageIdentity,
 )
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ControlRequest,
     AssignPortRequest,
     ControlInvocation,
@@ -64,18 +63,18 @@
     EmbeddedControlMessageType,
     EmbeddedControlMessage,
 )
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
     OneToOnePartitioning,
     Partitioning,
 )
-from proto.edu.uci.ics.amber.engine.architecture.worker import (
+from proto.org.apache.texera.amber.engine.architecture.worker import (
     WorkerMetrics,
     WorkerState,
     WorkerStatistics,
     PortTupleMetricsMapping,
     TupleMetrics,
 )
-from proto.edu.uci.ics.amber.engine.common import DirectControlMessagePayloadV2
+from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2
 from pytexera.udf.examples.count_batch_operator import CountBatchOperator
 from pytexera.udf.examples.echo_operator import EchoOperator
 
@@ -339,7 +338,6 @@ def mock_initialize_executor(
         command_sequence,
         mock_raw_schema,
     ):
-
         operator_code = "from pytexera import *\n" + inspect.getsource(EchoOperator)
         command = set_one_of(
             ControlRequest,
@@ -369,7 +367,6 @@ def mock_initialize_batch_count_executor(
         command_sequence,
         mock_raw_schema,
     ):
-
         operator_code = "from pytexera import *\n" + inspect.getsource(
             CountBatchOperator
         )
diff --git a/core/amber/src/main/python/core/runnables/test_network_receiver.py b/amber/src/main/python/core/runnables/test_network_receiver.py
similarity index 97%
rename from core/amber/src/main/python/core/runnables/test_network_receiver.py
rename to amber/src/main/python/core/runnables/test_network_receiver.py
index 005325f76d4..2cc2541f2d5 100644
--- a/core/amber/src/main/python/core/runnables/test_network_receiver.py
+++ b/amber/src/main/python/core/runnables/test_network_receiver.py
@@ -15,9 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import threading
-
 import pytest
+import threading
 from pyarrow import Table
 
 from core.models.internal_queue import (
@@ -31,7 +30,12 @@
 from core.runnables.network_receiver import NetworkReceiver
 from core.runnables.network_sender import NetworkSender
 from core.util.proto import set_one_of
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.core import (
+    ActorVirtualIdentity,
+    ChannelIdentity,
+    EmbeddedControlMessageIdentity,
+)
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ControlInvocation,
     EmbeddedControlMessage,
     EmbeddedControlMessageType,
@@ -39,12 +43,7 @@
     AsyncRpcContext,
     ControlRequest,
 )
-from proto.edu.uci.ics.amber.engine.common import DirectControlMessagePayloadV2
-from proto.edu.uci.ics.amber.core import (
-    ActorVirtualIdentity,
-    ChannelIdentity,
-    EmbeddedControlMessageIdentity,
-)
+from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2
 
 
 class TestNetworkReceiver:
diff --git a/core/amber/src/main/python/core/runnables/test_network_sender.py b/amber/src/main/python/core/runnables/test_network_sender.py
similarity index 99%
rename from core/amber/src/main/python/core/runnables/test_network_sender.py
rename to amber/src/main/python/core/runnables/test_network_sender.py
index 263182cb165..529cd19d33e 100644
--- a/core/amber/src/main/python/core/runnables/test_network_sender.py
+++ b/amber/src/main/python/core/runnables/test_network_sender.py
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import pytest
 import threading
 from time import sleep
 
-import pytest
-
 from core.models.internal_queue import InternalQueue
 from core.runnables.network_receiver import NetworkReceiver
 from core.runnables.network_sender import NetworkSender
diff --git a/core/amber/src/main/python/core/storage/__init__.py b/amber/src/main/python/core/storage/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/__init__.py
rename to amber/src/main/python/core/storage/__init__.py
diff --git a/core/amber/src/main/python/core/storage/document_factory.py b/amber/src/main/python/core/storage/document_factory.py
similarity index 95%
rename from core/amber/src/main/python/core/storage/document_factory.py
rename to amber/src/main/python/core/storage/document_factory.py
index 48e08d07ceb..9b686ab66b6 100644
--- a/core/amber/src/main/python/core/storage/document_factory.py
+++ b/amber/src/main/python/core/storage/document_factory.py
@@ -17,15 +17,15 @@
 
 import typing
 import urllib
-from urllib.parse import urlparse
-
 from typing import Optional
+from urllib.parse import urlparse
 
 from core.models import Schema, Tuple
 from core.storage.iceberg.iceberg_catalog_instance import IcebergCatalogInstance
 from core.storage.iceberg.iceberg_document import IcebergDocument
 from core.storage.iceberg.iceberg_utils import (
     create_table,
+    amber_schema_to_iceberg_schema,
     amber_tuples_to_arrow_table,
     arrow_table_to_amber_tuples,
     load_table_metadata,
@@ -64,7 +64,9 @@ def create_document(uri: str, schema: Schema) -> VirtualDocument:
             if resource_type in {VFSResourceType.RESULT}:
                 storage_key = DocumentFactory.sanitize_uri_path(parsed_uri)
 
-                iceberg_schema = Schema.as_arrow_schema(schema)
+                # Convert Amber Schema to Iceberg Schema with LARGE_BINARY
+                # field name encoding
+                iceberg_schema = amber_schema_to_iceberg_schema(schema)
 
                 create_table(
                     IcebergCatalogInstance.get_instance(),
diff --git a/core/amber/src/main/python/core/storage/iceberg/__init__.py b/amber/src/main/python/core/storage/iceberg/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/iceberg/__init__.py
rename to amber/src/main/python/core/storage/iceberg/__init__.py
diff --git a/core/amber/src/main/python/core/storage/iceberg/iceberg_catalog_instance.py b/amber/src/main/python/core/storage/iceberg/iceberg_catalog_instance.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/iceberg/iceberg_catalog_instance.py
rename to amber/src/main/python/core/storage/iceberg/iceberg_catalog_instance.py
diff --git a/core/amber/src/main/python/core/storage/iceberg/iceberg_document.py b/amber/src/main/python/core/storage/iceberg/iceberg_document.py
similarity index 99%
rename from core/amber/src/main/python/core/storage/iceberg/iceberg_document.py
rename to amber/src/main/python/core/storage/iceberg/iceberg_document.py
index 4ce3dc42492..997ab9b5b70 100644
--- a/core/amber/src/main/python/core/storage/iceberg/iceberg_document.py
+++ b/amber/src/main/python/core/storage/iceberg/iceberg_document.py
@@ -15,17 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from itertools import islice
-from threading import RLock
-from typing import Iterator, Optional, Callable, Iterable
-from typing import TypeVar
-from urllib.parse import ParseResult, urlparse
-
 import pyarrow as pa
+from itertools import islice
 from pyiceberg.catalog import Catalog
 from pyiceberg.schema import Schema
 from pyiceberg.table import Table, FileScanTask
 from readerwriterlock import rwlock
+from threading import RLock
+from typing import Iterator, Optional, Callable, Iterable
+from typing import TypeVar
+from urllib.parse import ParseResult, urlparse
 
 from core.storage.iceberg.iceberg_catalog_instance import IcebergCatalogInstance
 from core.storage.iceberg.iceberg_table_writer import IcebergTableWriter
diff --git a/core/amber/src/main/python/core/storage/iceberg/iceberg_table_writer.py b/amber/src/main/python/core/storage/iceberg/iceberg_table_writer.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/iceberg/iceberg_table_writer.py
rename to amber/src/main/python/core/storage/iceberg/iceberg_table_writer.py
diff --git a/core/amber/src/main/python/core/storage/iceberg/iceberg_utils.py b/amber/src/main/python/core/storage/iceberg/iceberg_utils.py
similarity index 52%
rename from core/amber/src/main/python/core/storage/iceberg/iceberg_utils.py
rename to amber/src/main/python/core/storage/iceberg/iceberg_utils.py
index 12c841ed71f..9e17b2e0e82 100644
--- a/core/amber/src/main/python/core/storage/iceberg/iceberg_utils.py
+++ b/amber/src/main/python/core/storage/iceberg/iceberg_utils.py
@@ -25,9 +25,103 @@
 from pyiceberg.schema import Schema
 from pyiceberg.table import Table
 from typing import Optional, Iterable
+from pyiceberg import types as iceberg_types
 
 import core
+import core.models
 from core.models import ArrowTableTupleProvider, Tuple
+from core.models.schema.attribute_type import AttributeType, TO_ARROW_MAPPING
+
+# Suffix used to encode LARGE_BINARY fields in Iceberg (must match Scala IcebergUtil)
+LARGE_BINARY_FIELD_SUFFIX = "__texera_large_binary_ptr"
+
+# Type mappings
+_ICEBERG_TO_AMBER_TYPE_MAPPING = {
+    "string": "STRING",
+    "int": "INT",
+    "integer": "INT",
+    "long": "LONG",
+    "double": "DOUBLE",
+    "float": "DOUBLE",
+    "boolean": "BOOL",
+    "timestamp": "TIMESTAMP",
+    "binary": "BINARY",
+}
+
+_AMBER_TO_ICEBERG_TYPE_MAPPING = {
+    AttributeType.STRING: iceberg_types.StringType(),
+    AttributeType.INT: iceberg_types.IntegerType(),
+    AttributeType.LONG: iceberg_types.LongType(),
+    AttributeType.DOUBLE: iceberg_types.DoubleType(),
+    AttributeType.BOOL: iceberg_types.BooleanType(),
+    AttributeType.TIMESTAMP: iceberg_types.TimestampType(),
+    AttributeType.BINARY: iceberg_types.BinaryType(),
+    AttributeType.LARGE_BINARY: iceberg_types.StringType(),
+}
+
+
+def encode_large_binary_field_name(field_name: str, attr_type) -> str:
+    """Encodes LARGE_BINARY field names with suffix for Iceberg storage."""
+    if attr_type == AttributeType.LARGE_BINARY:
+        return f"{field_name}{LARGE_BINARY_FIELD_SUFFIX}"
+    return field_name
+
+
+def decode_large_binary_field_name(field_name: str) -> str:
+    """Decodes field names by removing LARGE_BINARY suffix if present."""
+    if field_name.endswith(LARGE_BINARY_FIELD_SUFFIX):
+        return field_name[: -len(LARGE_BINARY_FIELD_SUFFIX)]
+    return field_name
+
+
+def iceberg_schema_to_amber_schema(iceberg_schema: Schema):
+    """
+    Converts PyIceberg Schema to Amber Schema.
+    Decodes LARGE_BINARY field names and adds Arrow metadata.
+    """
+    arrow_fields = []
+    for field in iceberg_schema.fields:
+        decoded_name = decode_large_binary_field_name(field.name)
+        is_large_binary = field.name != decoded_name
+
+        if is_large_binary:
+            attr_type = AttributeType.LARGE_BINARY
+        else:
+            iceberg_type_str = str(field.field_type).lower()
+            attr_type_name = _ICEBERG_TO_AMBER_TYPE_MAPPING.get(
+                iceberg_type_str, "STRING"
+            )
+            attr_type = getattr(AttributeType, attr_type_name)
+
+        arrow_fields.append(
+            pa.field(
+                decoded_name,
+                TO_ARROW_MAPPING[attr_type],
+                metadata={b"texera_type": b"LARGE_BINARY"} if is_large_binary else None,
+            )
+        )
+
+    return core.models.Schema(pa.schema(arrow_fields))
+
+
+def amber_schema_to_iceberg_schema(amber_schema) -> Schema:
+    """
+    Converts Amber Schema to PyIceberg Schema.
+    Encodes LARGE_BINARY field names with suffix.
+    """
+    fields = [
+        iceberg_types.NestedField(
+            field_id=idx,
+            name=encode_large_binary_field_name(field_name, attr_type),
+            field_type=_AMBER_TO_ICEBERG_TYPE_MAPPING[attr_type],
+            required=False,
+        )
+        for idx, (field_name, attr_type) in enumerate(
+            amber_schema._name_type_mapping.items(), start=1
+        )
+    ]
+
+    return Schema(*fields)
 
 
 def create_postgres_catalog(
@@ -135,27 +229,47 @@ def amber_tuples_to_arrow_table(
 ) -> pa.Table:
     """
     Converts a list of amber tuples to a pyarrow table for serialization.
+    Handles LARGE_BINARY field name encoding and serialization.
     """
-    return pa.Table.from_pydict(
-        {
-            name: [t[name] for t in tuple_list]
-            for name in iceberg_schema.as_arrow().names
-        },
-        schema=iceberg_schema.as_arrow(),
-    )
+    from core.models.type.large_binary import largebinary
+
+    tuple_list = list(tuple_list)  # Convert to list to allow multiple iterations
+    data_dict = {}
+    for encoded_name in iceberg_schema.as_arrow().names:
+        decoded_name = decode_large_binary_field_name(encoded_name)
+        data_dict[encoded_name] = [
+            (
+                t[decoded_name].uri
+                if isinstance(t[decoded_name], largebinary)
+                else t[decoded_name]
+            )
+            for t in tuple_list
+        ]
+
+    return pa.Table.from_pydict(data_dict, schema=iceberg_schema.as_arrow())
 
 
 def arrow_table_to_amber_tuples(
     iceberg_schema: Schema, arrow_table: pa.Table
 ) -> Iterable[Tuple]:
     """
-    Converts an arrow table to a list of amber tuples for deserialization.
+    Converts an arrow table read from Iceberg to Amber tuples.
+    Properly handles LARGE_BINARY field name decoding and type detection.
     """
-    tuple_provider = ArrowTableTupleProvider(arrow_table)
+    amber_schema = iceberg_schema_to_amber_schema(iceberg_schema)
+    arrow_table_with_metadata = pa.Table.from_arrays(
+        [arrow_table.column(name) for name in arrow_table.column_names],
+        schema=amber_schema.as_arrow_schema(),
+    )
+
+    tuple_provider = ArrowTableTupleProvider(arrow_table_with_metadata)
     return (
         Tuple(
-            {name: field_accessor for name in arrow_table.column_names},
-            schema=core.models.Schema(iceberg_schema.as_arrow()),
+            {
+                decode_large_binary_field_name(name): field_accessor
+                for name in arrow_table.column_names
+            },
+            schema=amber_schema,
         )
         for field_accessor in tuple_provider
     )
diff --git a/core/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py b/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py
similarity index 90%
rename from core/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py
rename to amber/src/main/python/core/storage/iceberg/test_iceberg_document.py
index d64be7de716..34711beb652 100644
--- a/core/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py
+++ b/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py
@@ -16,18 +16,17 @@
 # under the License.
 
 import datetime
+import pytest
 import random
 import uuid
 from concurrent.futures import as_completed
 from concurrent.futures.thread import ThreadPoolExecutor
 
-import pytest
-
 from core.models import Schema, Tuple
 from core.storage.document_factory import DocumentFactory
 from core.storage.storage_config import StorageConfig
 from core.storage.vfs_uri_factory import VFSURIFactory
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     WorkflowIdentity,
     ExecutionIdentity,
     OperatorIdentity,
@@ -42,13 +41,16 @@
     postgres_username="texera",
     postgres_password="password",
     table_result_namespace="operator-port-result",
-    directory_path="../../../../../../core/amber/user-resources/workflow-results",
+    directory_path="../../../../../../amber/user-resources/workflow-results",
     commit_batch_size=4096,
+    s3_endpoint="http://localhost:9000",
+    s3_region="us-east-1",
+    s3_auth_username="minioadmin",
+    s3_auth_password="minioadmin",
 )
 
 
 class TestIcebergDocument:
-
     @pytest.fixture
     def amber_schema(self):
         """Sample Amber schema"""
@@ -205,8 +207,7 @@ def test_concurrent_writes_followed_by_read(self, iceberg_document, sample_items
         # Create writer's batches
         item_batches = [
             all_items[
-                i * batch_size
-                + min(i, remainder) : i * batch_size
+                i * batch_size + min(i, remainder) : i * batch_size
                 + min(i, remainder)
                 + batch_size
                 + (1 if i < remainder else 0)
@@ -214,9 +215,9 @@ def test_concurrent_writes_followed_by_read(self, iceberg_document, sample_items
             for i in range(num_writers)
         ]
 
-        assert (
-            len(item_batches) == num_writers
-        ), f"Expected {num_writers} batches but got {len(item_batches)}"
+        assert len(item_batches) == num_writers, (
+            f"Expected {num_writers} batches but got {len(item_batches)}"
+        )
 
         # Perform concurrent writes
         def write_batch(batch):
@@ -234,9 +235,9 @@ def write_batch(batch):
         # Read all items back
         retrieved_items = list(iceberg_document.get())
         # Verify that the retrieved items match the original items
-        assert set(retrieved_items) == set(
-            all_items
-        ), "All items should be read correctly after concurrent writes."
+        assert set(retrieved_items) == set(all_items), (
+            "All items should be read correctly after concurrent writes."
+        )
 
     def test_read_using_range(self, iceberg_document, sample_items):
         """
@@ -260,14 +261,14 @@ def test_read_using_range(self, iceberg_document, sample_items):
             item for r in ranges for item in iceberg_document.get_range(r.start, r.stop)
         ]
 
-        assert len(retrieved_items) == len(
-            sample_items
-        ), "The number of retrieved items does not match the number of all items."
+        assert len(retrieved_items) == len(sample_items), (
+            "The number of retrieved items does not match the number of all items."
+        )
 
         # Verify that the retrieved items match the original items
-        assert set(retrieved_items) == set(
-            sample_items
-        ), "All items should be retrieved correctly using ranges."
+        assert set(retrieved_items) == set(sample_items), (
+            "All items should be retrieved correctly using ranges."
+        )
 
     def test_get_after(self, iceberg_document, sample_items):
         """
@@ -310,6 +311,6 @@ def test_get_counts(self, iceberg_document, sample_items):
             writer.put_one(item)
         writer.close()
 
-        assert iceberg_document.get_count() == len(
-            sample_items
-        ), "get_count should return the same number as the length of sample_items"
+        assert iceberg_document.get_count() == len(sample_items), (
+            "get_count should return the same number as the length of sample_items"
+        )
diff --git a/amber/src/main/python/core/storage/iceberg/test_iceberg_utils_large_binary.py b/amber/src/main/python/core/storage/iceberg/test_iceberg_utils_large_binary.py
new file mode 100644
index 00000000000..c601d4f7190
--- /dev/null
+++ b/amber/src/main/python/core/storage/iceberg/test_iceberg_utils_large_binary.py
@@ -0,0 +1,230 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pyarrow as pa
+from pyiceberg import types as iceberg_types
+from pyiceberg.schema import Schema as IcebergSchema
+from core.models import Schema, Tuple
+from core.models.schema.attribute_type import AttributeType
+from core.models.type.large_binary import largebinary
+from core.storage.iceberg.iceberg_utils import (
+    encode_large_binary_field_name,
+    decode_large_binary_field_name,
+    iceberg_schema_to_amber_schema,
+    amber_schema_to_iceberg_schema,
+    amber_tuples_to_arrow_table,
+    arrow_table_to_amber_tuples,
+)
+
+
+class TestIcebergUtilsLargeBinary:
+    def test_encode_large_binary_field_name(self):
+        """Test encoding LARGE_BINARY field names with suffix."""
+        assert (
+            encode_large_binary_field_name("my_field", AttributeType.LARGE_BINARY)
+            == "my_field__texera_large_binary_ptr"
+        )
+        assert (
+            encode_large_binary_field_name("my_field", AttributeType.STRING)
+            == "my_field"
+        )
+
+    def test_decode_large_binary_field_name(self):
+        """Test decoding LARGE_BINARY field names by removing suffix."""
+        assert (
+            decode_large_binary_field_name("my_field__texera_large_binary_ptr")
+            == "my_field"
+        )
+        assert decode_large_binary_field_name("my_field") == "my_field"
+        assert decode_large_binary_field_name("regular_field") == "regular_field"
+
+    def test_amber_schema_to_iceberg_schema_with_large_binary(self):
+        """Test converting Amber schema with LARGE_BINARY to Iceberg schema."""
+        amber_schema = Schema()
+        amber_schema.add("regular_field", AttributeType.STRING)
+        amber_schema.add("large_binary_field", AttributeType.LARGE_BINARY)
+        amber_schema.add("int_field", AttributeType.INT)
+
+        iceberg_schema = amber_schema_to_iceberg_schema(amber_schema)
+
+        # Check field names are encoded
+        field_names = [field.name for field in iceberg_schema.fields]
+        assert "regular_field" in field_names
+        assert "large_binary_field__texera_large_binary_ptr" in field_names
+        assert "int_field" in field_names
+
+        # Check types
+        large_binary_field = next(
+            f for f in iceberg_schema.fields if "large_binary" in f.name
+        )
+        assert isinstance(large_binary_field.field_type, iceberg_types.StringType)
+
+    def test_iceberg_schema_to_amber_schema_with_large_binary(self):
+        """Test converting Iceberg schema with LARGE_BINARY to Amber schema."""
+        iceberg_schema = IcebergSchema(
+            iceberg_types.NestedField(
+                1, "regular_field", iceberg_types.StringType(), required=False
+            ),
+            iceberg_types.NestedField(
+                2,
+                "large_binary_field__texera_large_binary_ptr",
+                iceberg_types.StringType(),
+                required=False,
+            ),
+            iceberg_types.NestedField(
+                3, "int_field", iceberg_types.IntegerType(), required=False
+            ),
+        )
+
+        amber_schema = iceberg_schema_to_amber_schema(iceberg_schema)
+
+        assert amber_schema.get_attr_type("regular_field") == AttributeType.STRING
+        assert (
+            amber_schema.get_attr_type("large_binary_field")
+            == AttributeType.LARGE_BINARY
+        )
+        assert amber_schema.get_attr_type("int_field") == AttributeType.INT
+
+        # Check Arrow schema has metadata for LARGE_BINARY
+        arrow_schema = amber_schema.as_arrow_schema()
+        large_binary_field = arrow_schema.field("large_binary_field")
+        assert large_binary_field.metadata is not None
+        assert large_binary_field.metadata.get(b"texera_type") == b"LARGE_BINARY"
+
+    def test_amber_tuples_to_arrow_table_with_large_binary(self):
+        """Test converting Amber tuples with largebinary to Arrow table."""
+        amber_schema = Schema()
+        amber_schema.add("regular_field", AttributeType.STRING)
+        amber_schema.add("large_binary_field", AttributeType.LARGE_BINARY)
+
+        large_binary1 = largebinary("s3://bucket/path1")
+        large_binary2 = largebinary("s3://bucket/path2")
+
+        tuples = [
+            Tuple(
+                {"regular_field": "value1", "large_binary_field": large_binary1},
+                schema=amber_schema,
+            ),
+            Tuple(
+                {"regular_field": "value2", "large_binary_field": large_binary2},
+                schema=amber_schema,
+            ),
+        ]
+
+        iceberg_schema = amber_schema_to_iceberg_schema(amber_schema)
+        arrow_table = amber_tuples_to_arrow_table(iceberg_schema, tuples)
+
+        # Check that largebinary values are converted to URI strings
+        regular_values = arrow_table.column("regular_field").to_pylist()
+        large_binary_values = arrow_table.column(
+            "large_binary_field__texera_large_binary_ptr"
+        ).to_pylist()
+
+        assert regular_values == ["value1", "value2"]
+        assert large_binary_values == ["s3://bucket/path1", "s3://bucket/path2"]
+
+    def test_arrow_table_to_amber_tuples_with_large_binary(self):
+        """Test converting Arrow table with LARGE_BINARY to Amber tuples."""
+        # Create Iceberg schema with encoded field name
+        iceberg_schema = IcebergSchema(
+            iceberg_types.NestedField(
+                1, "regular_field", iceberg_types.StringType(), required=False
+            ),
+            iceberg_types.NestedField(
+                2,
+                "large_binary_field__texera_large_binary_ptr",
+                iceberg_types.StringType(),
+                required=False,
+            ),
+        )
+
+        # Create Arrow table with URI strings
+        arrow_table = pa.Table.from_pydict(
+            {
+                "regular_field": ["value1", "value2"],
+                "large_binary_field__texera_large_binary_ptr": [
+                    "s3://bucket/path1",
+                    "s3://bucket/path2",
+                ],
+            }
+        )
+
+        tuples = list(arrow_table_to_amber_tuples(iceberg_schema, arrow_table))
+
+        assert len(tuples) == 2
+        assert tuples[0]["regular_field"] == "value1"
+        assert isinstance(tuples[0]["large_binary_field"], largebinary)
+        assert tuples[0]["large_binary_field"].uri == "s3://bucket/path1"
+
+        assert tuples[1]["regular_field"] == "value2"
+        assert isinstance(tuples[1]["large_binary_field"], largebinary)
+        assert tuples[1]["large_binary_field"].uri == "s3://bucket/path2"
+
+    def test_round_trip_large_binary_tuples(self):
+        """Test round-trip conversion of tuples with largebinary."""
+        amber_schema = Schema()
+        amber_schema.add("regular_field", AttributeType.STRING)
+        amber_schema.add("large_binary_field", AttributeType.LARGE_BINARY)
+
+        large_binary = largebinary("s3://bucket/path/to/object")
+        original_tuples = [
+            Tuple(
+                {"regular_field": "value1", "large_binary_field": large_binary},
+                schema=amber_schema,
+            ),
+        ]
+
+        # Convert to Iceberg and Arrow
+        iceberg_schema = amber_schema_to_iceberg_schema(amber_schema)
+        arrow_table = amber_tuples_to_arrow_table(iceberg_schema, original_tuples)
+
+        # Convert back to Amber tuples
+        retrieved_tuples = list(
+            arrow_table_to_amber_tuples(iceberg_schema, arrow_table)
+        )
+
+        assert len(retrieved_tuples) == 1
+        assert retrieved_tuples[0]["regular_field"] == "value1"
+        assert isinstance(retrieved_tuples[0]["large_binary_field"], largebinary)
+        assert retrieved_tuples[0]["large_binary_field"].uri == large_binary.uri
+
+    def test_arrow_table_to_amber_tuples_with_null_large_binary(self):
+        """Test converting Arrow table with null largebinary values."""
+        iceberg_schema = IcebergSchema(
+            iceberg_types.NestedField(
+                1, "regular_field", iceberg_types.StringType(), required=False
+            ),
+            iceberg_types.NestedField(
+                2,
+                "large_binary_field__texera_large_binary_ptr",
+                iceberg_types.StringType(),
+                required=False,
+            ),
+        )
+
+        arrow_table = pa.Table.from_pydict(
+            {
+                "regular_field": ["value1"],
+                "large_binary_field__texera_large_binary_ptr": [None],
+            }
+        )
+
+        tuples = list(arrow_table_to_amber_tuples(iceberg_schema, arrow_table))
+
+        assert len(tuples) == 1
+        assert tuples[0]["regular_field"] == "value1"
+        assert tuples[0]["large_binary_field"] is None
diff --git a/core/amber/src/main/python/core/storage/model/__init__.py b/amber/src/main/python/core/storage/model/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/model/__init__.py
rename to amber/src/main/python/core/storage/model/__init__.py
diff --git a/core/amber/src/main/python/core/storage/model/buffered_item_writer.py b/amber/src/main/python/core/storage/model/buffered_item_writer.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/model/buffered_item_writer.py
rename to amber/src/main/python/core/storage/model/buffered_item_writer.py
diff --git a/core/amber/src/main/python/core/storage/model/readonly_virtual_document.py b/amber/src/main/python/core/storage/model/readonly_virtual_document.py
similarity index 99%
rename from core/amber/src/main/python/core/storage/model/readonly_virtual_document.py
rename to amber/src/main/python/core/storage/model/readonly_virtual_document.py
index ef46dbaa028..986aaac77b1 100644
--- a/core/amber/src/main/python/core/storage/model/readonly_virtual_document.py
+++ b/amber/src/main/python/core/storage/model/readonly_virtual_document.py
@@ -16,9 +16,8 @@
 # under the License.
 
 from abc import ABC, abstractmethod
-from urllib.parse import ParseResult
-
 from typing import Generic, TypeVar, Iterator
+from urllib.parse import ParseResult
 
 # Define a type variable
 T = TypeVar("T")
diff --git a/core/amber/src/main/python/core/storage/model/virtual_document.py b/amber/src/main/python/core/storage/model/virtual_document.py
similarity index 99%
rename from core/amber/src/main/python/core/storage/model/virtual_document.py
rename to amber/src/main/python/core/storage/model/virtual_document.py
index 0f20b198640..e145c616138 100644
--- a/core/amber/src/main/python/core/storage/model/virtual_document.py
+++ b/amber/src/main/python/core/storage/model/virtual_document.py
@@ -16,10 +16,9 @@
 # under the License.
 
 from abc import ABC, abstractmethod
-from urllib.parse import ParseResult
-
 from overrides import overrides
 from typing import TypeVar, Iterator
+from urllib.parse import ParseResult
 
 from core.storage.model.buffered_item_writer import BufferedItemWriter
 from core.storage.model.readonly_virtual_document import ReadonlyVirtualDocument
diff --git a/core/amber/src/main/python/core/storage/runnables/__init__.py b/amber/src/main/python/core/storage/runnables/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/storage/runnables/__init__.py
rename to amber/src/main/python/core/storage/runnables/__init__.py
diff --git a/core/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py b/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py
similarity index 97%
rename from core/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py
rename to amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py
index 2fa25fdf4ac..c82926a60a0 100644
--- a/core/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py
+++ b/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py
@@ -16,8 +16,9 @@
 # under the License.
 
 import typing
-
+from loguru import logger
 from pyarrow.lib import Table
+from typing import Union
 
 from core.architecture.sendsemantics.broad_cast_partitioner import (
     BroadcastPartitioner,
@@ -39,22 +40,12 @@
 from core.util import Stoppable, get_one_of
 from core.util.runnable.runnable import Runnable
 from core.util.virtual_identity import get_from_actor_id_for_input_port_storage
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     ActorVirtualIdentity,
     ChannelIdentity,
     EmbeddedControlMessageIdentity,
 )
-from proto.edu.uci.ics.amber.engine.architecture.sendsemantics import (
-    HashBasedShufflePartitioning,
-    OneToOnePartitioning,
-    Partitioning,
-    RoundRobinPartitioning,
-    RangeBasedShufflePartitioning,
-    BroadcastPartitioning,
-)
-from loguru import logger
-from typing import Union
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ControlInvocation,
     EmptyRequest,
     EmbeddedControlMessageType,
@@ -62,6 +53,14 @@
     AsyncRpcContext,
     ControlRequest,
 )
+from proto.org.apache.texera.amber.engine.architecture.sendsemantics import (
+    HashBasedShufflePartitioning,
+    OneToOnePartitioning,
+    Partitioning,
+    RoundRobinPartitioning,
+    RangeBasedShufflePartitioning,
+    BroadcastPartitioning,
+)
 
 
 class InputPortMaterializationReaderRunnable(Runnable, Stoppable):
diff --git a/core/amber/src/main/python/core/storage/runnables/port_storage_writer.py b/amber/src/main/python/core/storage/runnables/port_storage_writer.py
similarity index 99%
rename from core/amber/src/main/python/core/storage/runnables/port_storage_writer.py
rename to amber/src/main/python/core/storage/runnables/port_storage_writer.py
index a0e6c74f5f9..5a026162526 100644
--- a/core/amber/src/main/python/core/storage/runnables/port_storage_writer.py
+++ b/amber/src/main/python/core/storage/runnables/port_storage_writer.py
@@ -16,7 +16,6 @@
 # under the License.
 
 from dataclasses import dataclass
-
 from overrides import overrides
 
 from core.models import Tuple
diff --git a/core/amber/src/main/python/core/storage/storage_config.py b/amber/src/main/python/core/storage/storage_config.py
similarity index 80%
rename from core/amber/src/main/python/core/storage/storage_config.py
rename to amber/src/main/python/core/storage/storage_config.py
index 21c918d5147..c55495ea14c 100644
--- a/core/amber/src/main/python/core/storage/storage_config.py
+++ b/amber/src/main/python/core/storage/storage_config.py
@@ -32,6 +32,12 @@ class StorageConfig:
     ICEBERG_FILE_STORAGE_DIRECTORY_PATH = None
     ICEBERG_TABLE_COMMIT_BATCH_SIZE = None
 
+    # S3 configs (for large_binary_manager module)
+    S3_ENDPOINT = None
+    S3_REGION = None
+    S3_AUTH_USERNAME = None
+    S3_AUTH_PASSWORD = None
+
     @classmethod
     def initialize(
         cls,
@@ -41,10 +47,14 @@ def initialize(
         table_result_namespace,
         directory_path,
         commit_batch_size,
+        s3_endpoint,
+        s3_region,
+        s3_auth_username,
+        s3_auth_password,
     ):
         if cls._initialized:
             raise RuntimeError(
-                "Storage config has already been initialized" "and cannot be modified."
+                "Storage config has already been initialized and cannot be modified."
             )
 
         cls.ICEBERG_POSTGRES_CATALOG_URI_WITHOUT_SCHEME = postgres_uri_without_scheme
@@ -53,6 +63,13 @@ def initialize(
         cls.ICEBERG_TABLE_RESULT_NAMESPACE = table_result_namespace
         cls.ICEBERG_FILE_STORAGE_DIRECTORY_PATH = directory_path
         cls.ICEBERG_TABLE_COMMIT_BATCH_SIZE = int(commit_batch_size)
+
+        # S3 configs
+        cls.S3_ENDPOINT = s3_endpoint
+        cls.S3_REGION = s3_region
+        cls.S3_AUTH_USERNAME = s3_auth_username
+        cls.S3_AUTH_PASSWORD = s3_auth_password
+
         cls._initialized = True
 
     def __new__(cls, *args, **kwargs):
diff --git a/core/amber/src/main/python/core/storage/vfs_uri_factory.py b/amber/src/main/python/core/storage/vfs_uri_factory.py
similarity index 98%
rename from core/amber/src/main/python/core/storage/vfs_uri_factory.py
rename to amber/src/main/python/core/storage/vfs_uri_factory.py
index 3aded2a9cf4..de0c5db56ec 100644
--- a/core/amber/src/main/python/core/storage/vfs_uri_factory.py
+++ b/amber/src/main/python/core/storage/vfs_uri_factory.py
@@ -23,7 +23,7 @@
     serialize_global_port_identity,
     deserialize_global_port_identity,
 )
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     WorkflowIdentity,
     ExecutionIdentity,
     GlobalPortIdentity,
diff --git a/core/amber/src/main/python/core/util/__init__.py b/amber/src/main/python/core/util/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/util/__init__.py
rename to amber/src/main/python/core/util/__init__.py
diff --git a/core/amber/src/main/python/core/util/buffer/buffer_base.py b/amber/src/main/python/core/util/buffer/buffer_base.py
similarity index 100%
rename from core/amber/src/main/python/core/util/buffer/buffer_base.py
rename to amber/src/main/python/core/util/buffer/buffer_base.py
diff --git a/core/amber/src/main/python/core/util/buffer/timed_buffer.py b/amber/src/main/python/core/util/buffer/timed_buffer.py
similarity index 95%
rename from core/amber/src/main/python/core/util/buffer/timed_buffer.py
rename to amber/src/main/python/core/util/buffer/timed_buffer.py
index da1dcd4588f..abaacb15705 100644
--- a/core/amber/src/main/python/core/util/buffer/timed_buffer.py
+++ b/amber/src/main/python/core/util/buffer/timed_buffer.py
@@ -19,7 +19,7 @@
 from typing import List, Iterator
 
 from core.util.buffer.buffer_base import IBuffer
-from proto.edu.uci.ics.amber.engine.architecture.rpc import ConsoleMessage
+from proto.org.apache.texera.amber.engine.architecture.rpc import ConsoleMessage
 
 
 class TimedBuffer(IBuffer):
diff --git a/core/amber/src/main/python/core/util/console_message/replace_print.py b/amber/src/main/python/core/util/console_message/replace_print.py
similarity index 98%
rename from core/amber/src/main/python/core/util/console_message/replace_print.py
rename to amber/src/main/python/core/util/console_message/replace_print.py
index 929d120854c..7feeeeb52d0 100644
--- a/core/amber/src/main/python/core/util/console_message/replace_print.py
+++ b/amber/src/main/python/core/util/console_message/replace_print.py
@@ -19,11 +19,11 @@
 import inspect
 from contextlib import redirect_stdout
 from io import StringIO
-
 from typing import ContextManager
-from core.util.console_message.timestamp import current_time_in_local_timezone
+
 from core.util.buffer.buffer_base import IBuffer
-from proto.edu.uci.ics.amber.engine.architecture.rpc import (
+from core.util.console_message.timestamp import current_time_in_local_timezone
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
     ConsoleMessage,
     ConsoleMessageType,
 )
diff --git a/core/amber/src/main/python/core/util/console_message/timed_buffer.py b/amber/src/main/python/core/util/console_message/timed_buffer.py
similarity index 94%
rename from core/amber/src/main/python/core/util/console_message/timed_buffer.py
rename to amber/src/main/python/core/util/console_message/timed_buffer.py
index 30fbf3fa408..59369f16b21 100644
--- a/core/amber/src/main/python/core/util/console_message/timed_buffer.py
+++ b/amber/src/main/python/core/util/console_message/timed_buffer.py
@@ -16,10 +16,11 @@
 # under the License.
 
 from datetime import datetime
-
 from typing import Tuple, List, Iterator
 
-from proto.edu.uci.ics.amber.engine.architecture.worker import PythonConsoleMessageV2
+from proto.org.apache.texera.amber.engine.architecture.worker import (
+    PythonConsoleMessageV2,
+)
 
 
 class TimedBuffer:
diff --git a/core/amber/src/main/python/core/util/console_message/timestamp.py b/amber/src/main/python/core/util/console_message/timestamp.py
similarity index 100%
rename from core/amber/src/main/python/core/util/console_message/timestamp.py
rename to amber/src/main/python/core/util/console_message/timestamp.py
diff --git a/core/amber/src/main/python/core/util/customized_queue/__init__.py b/amber/src/main/python/core/util/customized_queue/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/util/customized_queue/__init__.py
rename to amber/src/main/python/core/util/customized_queue/__init__.py
diff --git a/core/amber/src/main/python/core/util/customized_queue/double_blocking_queue.py b/amber/src/main/python/core/util/customized_queue/double_blocking_queue.py
similarity index 100%
rename from core/amber/src/main/python/core/util/customized_queue/double_blocking_queue.py
rename to amber/src/main/python/core/util/customized_queue/double_blocking_queue.py
diff --git a/core/amber/src/main/python/core/util/customized_queue/inner.py b/amber/src/main/python/core/util/customized_queue/inner.py
similarity index 100%
rename from core/amber/src/main/python/core/util/customized_queue/inner.py
rename to amber/src/main/python/core/util/customized_queue/inner.py
diff --git a/core/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py b/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py
similarity index 100%
rename from core/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py
rename to amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py
diff --git a/core/amber/src/main/python/core/util/customized_queue/queue_base.py b/amber/src/main/python/core/util/customized_queue/queue_base.py
similarity index 100%
rename from core/amber/src/main/python/core/util/customized_queue/queue_base.py
rename to amber/src/main/python/core/util/customized_queue/queue_base.py
diff --git a/core/amber/src/main/python/core/util/customized_queue/test_linked_blocking_multi_queue.py b/amber/src/main/python/core/util/customized_queue/test_linked_blocking_multi_queue.py
similarity index 99%
rename from core/amber/src/main/python/core/util/customized_queue/test_linked_blocking_multi_queue.py
rename to amber/src/main/python/core/util/customized_queue/test_linked_blocking_multi_queue.py
index 5b84e080670..1df9423b69b 100644
--- a/core/amber/src/main/python/core/util/customized_queue/test_linked_blocking_multi_queue.py
+++ b/amber/src/main/python/core/util/customized_queue/test_linked_blocking_multi_queue.py
@@ -15,12 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import pytest
 import random
 import time
 from threading import Thread
 
-import pytest
-
 from core.util.customized_queue.linked_blocking_multi_queue import (
     LinkedBlockingMultiQueue,
 )
diff --git a/core/amber/src/main/python/core/util/expression_evaluator/__init__.py b/amber/src/main/python/core/util/expression_evaluator/__init__.py
similarity index 98%
rename from core/amber/src/main/python/core/util/expression_evaluator/__init__.py
rename to amber/src/main/python/core/util/expression_evaluator/__init__.py
index 831beb1fc88..b13e6a05191 100644
--- a/core/amber/src/main/python/core/util/expression_evaluator/__init__.py
+++ b/amber/src/main/python/core/util/expression_evaluator/__init__.py
@@ -20,7 +20,10 @@
 from collections.abc import Iterator, Mapping
 from typing import Any, Dict, List, Optional, Pattern, Tuple
 
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EvaluatedValue, TypedValue
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
+    EvaluatedValue,
+    TypedValue,
+)
 
 
 class ExpressionEvaluator:
diff --git a/core/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py b/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py
similarity index 99%
rename from core/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py
rename to amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py
index 54a64ca58ec..19340bdccda 100644
--- a/core/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py
+++ b/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py
@@ -16,7 +16,10 @@
 # under the License.
 
 from core.util.expression_evaluator import ExpressionEvaluator
-from proto.edu.uci.ics.amber.engine.architecture.rpc import EvaluatedValue, TypedValue
+from proto.org.apache.texera.amber.engine.architecture.rpc import (
+    EvaluatedValue,
+    TypedValue,
+)
 
 
 class TestExpressionEvaluator:
diff --git a/core/amber/src/main/python/core/util/operator/__init__.py b/amber/src/main/python/core/util/operator/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/util/operator/__init__.py
rename to amber/src/main/python/core/util/operator/__init__.py
diff --git a/core/amber/src/main/python/core/util/proto/__init__.py b/amber/src/main/python/core/util/proto/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/util/proto/__init__.py
rename to amber/src/main/python/core/util/proto/__init__.py
diff --git a/core/amber/src/main/python/core/util/protocol/base_protocols.py b/amber/src/main/python/core/util/protocol/base_protocols.py
similarity index 100%
rename from core/amber/src/main/python/core/util/protocol/base_protocols.py
rename to amber/src/main/python/core/util/protocol/base_protocols.py
diff --git a/core/amber/src/main/python/core/util/runnable/runnable.py b/amber/src/main/python/core/util/runnable/runnable.py
similarity index 100%
rename from core/amber/src/main/python/core/util/runnable/runnable.py
rename to amber/src/main/python/core/util/runnable/runnable.py
diff --git a/core/amber/src/main/python/core/util/stoppable/__init__.py b/amber/src/main/python/core/util/stoppable/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/util/stoppable/__init__.py
rename to amber/src/main/python/core/util/stoppable/__init__.py
diff --git a/core/amber/src/main/python/core/util/stoppable/stoppable.py b/amber/src/main/python/core/util/stoppable/stoppable.py
similarity index 100%
rename from core/amber/src/main/python/core/util/stoppable/stoppable.py
rename to amber/src/main/python/core/util/stoppable/stoppable.py
diff --git a/core/amber/src/main/python/core/util/stoppable/stoppable_queue_blocking_thread.py b/amber/src/main/python/core/util/stoppable/stoppable_queue_blocking_thread.py
similarity index 100%
rename from core/amber/src/main/python/core/util/stoppable/stoppable_queue_blocking_thread.py
rename to amber/src/main/python/core/util/stoppable/stoppable_queue_blocking_thread.py
diff --git a/core/amber/src/main/python/core/util/thread/__init__.py b/amber/src/main/python/core/util/thread/__init__.py
similarity index 100%
rename from core/amber/src/main/python/core/util/thread/__init__.py
rename to amber/src/main/python/core/util/thread/__init__.py
diff --git a/core/amber/src/main/python/core/util/thread/atomic.py b/amber/src/main/python/core/util/thread/atomic.py
similarity index 100%
rename from core/amber/src/main/python/core/util/thread/atomic.py
rename to amber/src/main/python/core/util/thread/atomic.py
diff --git a/core/amber/src/main/python/core/util/virtual_identity/__init__.py b/amber/src/main/python/core/util/virtual_identity/__init__.py
similarity index 98%
rename from core/amber/src/main/python/core/util/virtual_identity/__init__.py
rename to amber/src/main/python/core/util/virtual_identity/__init__.py
index 2e0d1362cc7..93a887d7c68 100644
--- a/core/amber/src/main/python/core/util/virtual_identity/__init__.py
+++ b/amber/src/main/python/core/util/virtual_identity/__init__.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import re
-from proto.edu.uci.ics.amber.core import (
+from proto.org.apache.texera.amber.core import (
     GlobalPortIdentity,
     PhysicalOpIdentity,
     OperatorIdentity,
diff --git a/core/gui/src/assets/.gitkeep b/amber/src/main/python/proto/__init__.py
similarity index 100%
rename from core/gui/src/assets/.gitkeep
rename to amber/src/main/python/proto/__init__.py
diff --git a/amber/src/main/python/proto/org/__init__.py b/amber/src/main/python/proto/org/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amber/src/main/python/proto/org/apache/__init__.py b/amber/src/main/python/proto/org/apache/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amber/src/main/python/proto/org/apache/texera/__init__.py b/amber/src/main/python/proto/org/apache/texera/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amber/src/main/python/proto/org/apache/texera/amber/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/core/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py
similarity index 82%
rename from core/amber/src/main/python/proto/edu/uci/ics/amber/core/__init__.py
rename to amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py
index 1e57298fe5f..35975bc0e6c 100644
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/core/__init__.py
+++ b/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py
@@ -1,22 +1,5 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: edu/uci/ics/amber/core/executor.proto, edu/uci/ics/amber/core/virtualidentity.proto, edu/uci/ics/amber/core/workflow.proto, edu/uci/ics/amber/core/workflowruntimestate.proto
+# sources: org/apache/texera/amber/core/executor.proto, org/apache/texera/amber/core/virtualidentity.proto, org/apache/texera/amber/core/workflow.proto, org/apache/texera/amber/core/workflowruntimestate.proto
 # plugin: python-betterproto
 # This file has been @generated
 
diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/rpc/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py
similarity index 86%
rename from core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/rpc/__init__.py
rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py
index ac8e98914a1..ea6ddc5e43f 100644
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/rpc/__init__.py
+++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py
@@ -1,22 +1,5 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto, edu/uci/ics/amber/engine/architecture/rpc/controllerservice.proto, edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto, edu/uci/ics/amber/engine/architecture/rpc/testerservice.proto, edu/uci/ics/amber/engine/architecture/rpc/workerservice.proto
+# sources: org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto, org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto, org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto, org/apache/texera/amber/engine/architecture/rpc/testerservice.proto, org/apache/texera/amber/engine/architecture/rpc/workerservice.proto
 # plugin: python-betterproto
 # This file has been @generated
 
@@ -544,7 +527,7 @@ async def send_ping(
         metadata: Optional["MetadataLike"] = None
     ) -> "IntResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendPing",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPing",
             ping,
             IntResponse,
             timeout=timeout,
@@ -561,7 +544,7 @@ async def send_pong(
         metadata: Optional["MetadataLike"] = None
     ) -> "IntResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendPong",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPong",
             pong,
             IntResponse,
             timeout=timeout,
@@ -578,7 +561,7 @@ async def send_nested(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendNested",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendNested",
             nested,
             StringResponse,
             timeout=timeout,
@@ -595,7 +578,7 @@ async def send_pass(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendPass",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPass",
             pass_,
             StringResponse,
             timeout=timeout,
@@ -612,7 +595,7 @@ async def send_error_command(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendErrorCommand",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendErrorCommand",
             error_command,
             StringResponse,
             timeout=timeout,
@@ -629,7 +612,7 @@ async def send_recursion(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendRecursion",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendRecursion",
             recursion,
             StringResponse,
             timeout=timeout,
@@ -646,7 +629,7 @@ async def send_collect(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendCollect",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendCollect",
             collect,
             StringResponse,
             timeout=timeout,
@@ -663,7 +646,7 @@ async def send_generate_number(
         metadata: Optional["MetadataLike"] = None
     ) -> "IntResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber",
             generate_number,
             IntResponse,
             timeout=timeout,
@@ -680,7 +663,7 @@ async def send_multi_call(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendMultiCall",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendMultiCall",
             multi_call,
             StringResponse,
             timeout=timeout,
@@ -697,7 +680,7 @@ async def send_chain(
         metadata: Optional["MetadataLike"] = None
     ) -> "StringResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendChain",
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendChain",
             chain,
             StringResponse,
             timeout=timeout,
@@ -716,7 +699,7 @@ async def add_input_channel(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/AddInputChannel",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddInputChannel",
             add_input_channel_request,
             EmptyReturn,
             timeout=timeout,
@@ -733,7 +716,7 @@ async def add_partitioning(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/AddPartitioning",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddPartitioning",
             add_partitioning_request,
             EmptyReturn,
             timeout=timeout,
@@ -750,7 +733,7 @@ async def assign_port(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/AssignPort",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AssignPort",
             assign_port_request,
             EmptyReturn,
             timeout=timeout,
@@ -767,7 +750,7 @@ async def finalize_checkpoint(
         metadata: Optional["MetadataLike"] = None
     ) -> "FinalizeCheckpointResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint",
             finalize_checkpoint_request,
             FinalizeCheckpointResponse,
             timeout=timeout,
@@ -784,7 +767,7 @@ async def flush_network_buffer(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -801,7 +784,7 @@ async def initialize_executor(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/InitializeExecutor",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/InitializeExecutor",
             initialize_executor_request,
             EmptyReturn,
             timeout=timeout,
@@ -818,7 +801,7 @@ async def open_executor(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/OpenExecutor",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/OpenExecutor",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -835,7 +818,7 @@ async def pause_worker(
         metadata: Optional["MetadataLike"] = None
     ) -> "WorkerStateResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/PauseWorker",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PauseWorker",
             empty_request,
             WorkerStateResponse,
             timeout=timeout,
@@ -852,7 +835,7 @@ async def prepare_checkpoint(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint",
             prepare_checkpoint_request,
             EmptyReturn,
             timeout=timeout,
@@ -869,7 +852,7 @@ async def query_statistics(
         metadata: Optional["MetadataLike"] = None
     ) -> "WorkerMetricsResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/QueryStatistics",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/QueryStatistics",
             empty_request,
             WorkerMetricsResponse,
             timeout=timeout,
@@ -886,7 +869,7 @@ async def resume_worker(
         metadata: Optional["MetadataLike"] = None
     ) -> "WorkerStateResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/ResumeWorker",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/ResumeWorker",
             empty_request,
             WorkerStateResponse,
             timeout=timeout,
@@ -903,7 +886,7 @@ async def retrieve_state(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/RetrieveState",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetrieveState",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -920,7 +903,7 @@ async def retry_current_tuple(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -937,7 +920,7 @@ async def start_worker(
         metadata: Optional["MetadataLike"] = None
     ) -> "WorkerStateResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/StartWorker",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartWorker",
             empty_request,
             WorkerStateResponse,
             timeout=timeout,
@@ -954,7 +937,7 @@ async def end_worker(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/EndWorker",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndWorker",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -971,7 +954,7 @@ async def start_channel(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/StartChannel",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartChannel",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -988,7 +971,7 @@ async def end_channel(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/EndChannel",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndChannel",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -1005,7 +988,7 @@ async def debug_command(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/DebugCommand",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/DebugCommand",
             debug_command_request,
             EmptyReturn,
             timeout=timeout,
@@ -1022,7 +1005,7 @@ async def evaluate_python_expression(
         metadata: Optional["MetadataLike"] = None
     ) -> "EvaluatedValue":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression",
             evaluate_python_expression_request,
             EvaluatedValue,
             timeout=timeout,
@@ -1039,7 +1022,7 @@ async def no_operation(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/NoOperation",
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/NoOperation",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -1058,7 +1041,7 @@ async def retrieve_workflow_state(
         metadata: Optional["MetadataLike"] = None
     ) -> "RetrieveWorkflowStateResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState",
             empty_request,
             RetrieveWorkflowStateResponse,
             timeout=timeout,
@@ -1075,7 +1058,7 @@ async def propagate_embedded_control_message(
         metadata: Optional["MetadataLike"] = None
     ) -> "PropagateEmbeddedControlMessageResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage",
             propagate_embedded_control_message_request,
             PropagateEmbeddedControlMessageResponse,
             timeout=timeout,
@@ -1092,7 +1075,7 @@ async def take_global_checkpoint(
         metadata: Optional["MetadataLike"] = None
     ) -> "TakeGlobalCheckpointResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint",
             take_global_checkpoint_request,
             TakeGlobalCheckpointResponse,
             timeout=timeout,
@@ -1109,7 +1092,7 @@ async def debug_command(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/DebugCommand",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/DebugCommand",
             debug_command_request,
             EmptyReturn,
             timeout=timeout,
@@ -1126,7 +1109,7 @@ async def evaluate_python_expression(
         metadata: Optional["MetadataLike"] = None
     ) -> "EvaluatePythonExpressionResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression",
             evaluate_python_expression_request,
             EvaluatePythonExpressionResponse,
             timeout=timeout,
@@ -1143,7 +1126,7 @@ async def console_message_triggered(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered",
             console_message_triggered_request,
             EmptyReturn,
             timeout=timeout,
@@ -1160,7 +1143,7 @@ async def port_completed(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/PortCompleted",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PortCompleted",
             port_completed_request,
             EmptyReturn,
             timeout=timeout,
@@ -1177,7 +1160,7 @@ async def start_workflow(
         metadata: Optional["MetadataLike"] = None
     ) -> "StartWorkflowResponse":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/StartWorkflow",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/StartWorkflow",
             empty_request,
             StartWorkflowResponse,
             timeout=timeout,
@@ -1194,7 +1177,7 @@ async def resume_workflow(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -1211,7 +1194,7 @@ async def pause_workflow(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/PauseWorkflow",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PauseWorkflow",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -1228,7 +1211,7 @@ async def worker_state_updated(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated",
             worker_state_updated_request,
             EmptyReturn,
             timeout=timeout,
@@ -1245,7 +1228,7 @@ async def worker_execution_completed(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted",
             empty_request,
             EmptyReturn,
             timeout=timeout,
@@ -1262,7 +1245,7 @@ async def link_workers(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/LinkWorkers",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/LinkWorkers",
             link_workers_request,
             EmptyReturn,
             timeout=timeout,
@@ -1279,7 +1262,7 @@ async def controller_initiate_query_statistics(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics",
             query_statistics_request,
             EmptyReturn,
             timeout=timeout,
@@ -1296,7 +1279,7 @@ async def retry_workflow(
         metadata: Optional["MetadataLike"] = None
     ) -> "EmptyReturn":
         return await self._unary_unary(
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/RetryWorkflow",
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetryWorkflow",
             retry_workflow_request,
             EmptyReturn,
             timeout=timeout,
@@ -1413,61 +1396,61 @@ async def __rpc_send_chain(
 
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendPing": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPing": grpclib.const.Handler(
                 self.__rpc_send_ping,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Ping,
                 IntResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendPong": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPong": grpclib.const.Handler(
                 self.__rpc_send_pong,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Pong,
                 IntResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendNested": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendNested": grpclib.const.Handler(
                 self.__rpc_send_nested,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Nested,
                 StringResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendPass": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPass": grpclib.const.Handler(
                 self.__rpc_send_pass,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Pass,
                 StringResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendErrorCommand": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendErrorCommand": grpclib.const.Handler(
                 self.__rpc_send_error_command,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 ErrorCommand,
                 StringResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendRecursion": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendRecursion": grpclib.const.Handler(
                 self.__rpc_send_recursion,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Recursion,
                 StringResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendCollect": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendCollect": grpclib.const.Handler(
                 self.__rpc_send_collect,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Collect,
                 StringResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber": grpclib.const.Handler(
                 self.__rpc_send_generate_number,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 GenerateNumber,
                 IntResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendMultiCall": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendMultiCall": grpclib.const.Handler(
                 self.__rpc_send_multi_call,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 MultiCall,
                 StringResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.RPCTester/SendChain": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendChain": grpclib.const.Handler(
                 self.__rpc_send_chain,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 Chain,
@@ -1708,121 +1691,121 @@ async def __rpc_no_operation(
 
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/AddInputChannel": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddInputChannel": grpclib.const.Handler(
                 self.__rpc_add_input_channel,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 AddInputChannelRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/AddPartitioning": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddPartitioning": grpclib.const.Handler(
                 self.__rpc_add_partitioning,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 AddPartitioningRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/AssignPort": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AssignPort": grpclib.const.Handler(
                 self.__rpc_assign_port,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 AssignPortRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint": grpclib.const.Handler(
                 self.__rpc_finalize_checkpoint,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 FinalizeCheckpointRequest,
                 FinalizeCheckpointResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer": grpclib.const.Handler(
                 self.__rpc_flush_network_buffer,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/InitializeExecutor": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/InitializeExecutor": grpclib.const.Handler(
                 self.__rpc_initialize_executor,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 InitializeExecutorRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/OpenExecutor": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/OpenExecutor": grpclib.const.Handler(
                 self.__rpc_open_executor,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/PauseWorker": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PauseWorker": grpclib.const.Handler(
                 self.__rpc_pause_worker,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 WorkerStateResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint": grpclib.const.Handler(
                 self.__rpc_prepare_checkpoint,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 PrepareCheckpointRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/QueryStatistics": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/QueryStatistics": grpclib.const.Handler(
                 self.__rpc_query_statistics,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 WorkerMetricsResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/ResumeWorker": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/ResumeWorker": grpclib.const.Handler(
                 self.__rpc_resume_worker,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 WorkerStateResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/RetrieveState": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetrieveState": grpclib.const.Handler(
                 self.__rpc_retrieve_state,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple": grpclib.const.Handler(
                 self.__rpc_retry_current_tuple,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/StartWorker": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartWorker": grpclib.const.Handler(
                 self.__rpc_start_worker,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 WorkerStateResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/EndWorker": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndWorker": grpclib.const.Handler(
                 self.__rpc_end_worker,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/StartChannel": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartChannel": grpclib.const.Handler(
                 self.__rpc_start_channel,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/EndChannel": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndChannel": grpclib.const.Handler(
                 self.__rpc_end_channel,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/DebugCommand": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/DebugCommand": grpclib.const.Handler(
                 self.__rpc_debug_command,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 DebugCommandRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression": grpclib.const.Handler(
                 self.__rpc_evaluate_python_expression,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EvaluatePythonExpressionRequest,
                 EvaluatedValue,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.WorkerService/NoOperation": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/NoOperation": grpclib.const.Handler(
                 self.__rpc_no_operation,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
@@ -2017,91 +2000,91 @@ async def __rpc_retry_workflow(
 
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState": grpclib.const.Handler(
                 self.__rpc_retrieve_workflow_state,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 RetrieveWorkflowStateResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage": grpclib.const.Handler(
                 self.__rpc_propagate_embedded_control_message,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 PropagateEmbeddedControlMessageRequest,
                 PropagateEmbeddedControlMessageResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint": grpclib.const.Handler(
                 self.__rpc_take_global_checkpoint,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 TakeGlobalCheckpointRequest,
                 TakeGlobalCheckpointResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/DebugCommand": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/DebugCommand": grpclib.const.Handler(
                 self.__rpc_debug_command,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 DebugCommandRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression": grpclib.const.Handler(
                 self.__rpc_evaluate_python_expression,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EvaluatePythonExpressionRequest,
                 EvaluatePythonExpressionResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered": grpclib.const.Handler(
                 self.__rpc_console_message_triggered,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 ConsoleMessageTriggeredRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/PortCompleted": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PortCompleted": grpclib.const.Handler(
                 self.__rpc_port_completed,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 PortCompletedRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/StartWorkflow": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/StartWorkflow": grpclib.const.Handler(
                 self.__rpc_start_workflow,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 StartWorkflowResponse,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow": grpclib.const.Handler(
                 self.__rpc_resume_workflow,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/PauseWorkflow": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PauseWorkflow": grpclib.const.Handler(
                 self.__rpc_pause_workflow,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated": grpclib.const.Handler(
                 self.__rpc_worker_state_updated,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 WorkerStateUpdatedRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted": grpclib.const.Handler(
                 self.__rpc_worker_execution_completed,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 EmptyRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/LinkWorkers": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/LinkWorkers": grpclib.const.Handler(
                 self.__rpc_link_workers,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 LinkWorkersRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics": grpclib.const.Handler(
                 self.__rpc_controller_initiate_query_statistics,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 QueryStatisticsRequest,
                 EmptyReturn,
             ),
-            "/edu.uci.ics.amber.engine.architecture.rpc.ControllerService/RetryWorkflow": grpclib.const.Handler(
+            "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetryWorkflow": grpclib.const.Handler(
                 self.__rpc_retry_workflow,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 RetryWorkflowRequest,
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/sendsemantics/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py
similarity index 72%
rename from core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/sendsemantics/__init__.py
rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py
index 0b10145b8a2..94ed31cce3f 100644
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/sendsemantics/__init__.py
+++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py
@@ -1,22 +1,5 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto
+# sources: org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto
 # plugin: python-betterproto
 # This file has been @generated
 
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/worker/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py
similarity index 61%
rename from core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/worker/__init__.py
rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py
index 804882f4cab..072e7c8ce65 100644
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/worker/__init__.py
+++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py
@@ -1,22 +1,5 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: edu/uci/ics/amber/engine/architecture/worker/statistics.proto
+# sources: org/apache/texera/amber/engine/architecture/worker/statistics.proto
 # plugin: python-betterproto
 # This file has been @generated
 
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/common/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py
similarity index 84%
rename from core/amber/src/main/python/proto/edu/uci/ics/amber/engine/common/__init__.py
rename to amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py
index 4ef2d414d8d..55c789aa395 100644
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/common/__init__.py
+++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py
@@ -1,22 +1,5 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: edu/uci/ics/amber/engine/common/actormessage.proto, edu/uci/ics/amber/engine/common/ambermessage.proto, edu/uci/ics/amber/engine/common/executionruntimestate.proto
+# sources: org/apache/texera/amber/engine/common/actormessage.proto, org/apache/texera/amber/engine/common/ambermessage.proto, org/apache/texera/amber/engine/common/executionruntimestate.proto
 # plugin: python-betterproto
 # This file has been @generated
 
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/texera/web/__init__.py b/amber/src/main/python/proto/org/apache/texera/web/__init__.py
similarity index 98%
rename from core/amber/src/main/python/proto/edu/uci/ics/texera/web/__init__.py
rename to amber/src/main/python/proto/org/apache/texera/web/__init__.py
index b0f8d666374..adb5848bb0c 100644
--- a/core/amber/src/main/python/proto/edu/uci/ics/texera/web/__init__.py
+++ b/amber/src/main/python/proto/org/apache/texera/web/__init__.py
@@ -16,7 +16,7 @@
 # under the License.
 
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: edu/uci/ics/texera/workflowruntimestate.proto
+# sources: org/apache/texera/workflowruntimestate.proto
 # plugin: python-betterproto
 # This file has been @generated
 
diff --git a/core/amber/src/main/python/proto/scalapb/__init__.py b/amber/src/main/python/proto/scalapb/__init__.py
similarity index 94%
rename from core/amber/src/main/python/proto/scalapb/__init__.py
rename to amber/src/main/python/proto/scalapb/__init__.py
index 153dd1b07aa..49c713815a5 100644
--- a/core/amber/src/main/python/proto/scalapb/__init__.py
+++ b/amber/src/main/python/proto/scalapb/__init__.py
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # sources: scalapb/scalapb.proto
 # plugin: python-betterproto
diff --git a/core/amber/src/main/python/pyamber/__init__.py b/amber/src/main/python/pyamber/__init__.py
similarity index 100%
rename from core/amber/src/main/python/pyamber/__init__.py
rename to amber/src/main/python/pyamber/__init__.py
diff --git a/core/amber/src/main/python/.flake8 b/amber/src/main/python/pyproject.toml
similarity index 81%
rename from core/amber/src/main/python/.flake8
rename to amber/src/main/python/pyproject.toml
index 5353d6fb5a4..72bfeb57245 100644
--- a/core/amber/src/main/python/.flake8
+++ b/amber/src/main/python/pyproject.toml
@@ -15,12 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-[flake8]
-extend-ignore =
-    F403,
-    F405,
-    E203,
-exclude =
-    proto,
-max-complexity = 10
-max-line-length = 88
+[tool.ruff]
+line-length = 88
+target-version = "py310"
+extend-exclude = ["proto"]
+
+[tool.ruff.lint]
+ignore = ["F403", "F405", "E203"]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
\ No newline at end of file
diff --git a/core/amber/src/main/python/pytexera/__init__.py b/amber/src/main/python/pytexera/__init__.py
similarity index 84%
rename from core/amber/src/main/python/pytexera/__init__.py
rename to amber/src/main/python/pytexera/__init__.py
index db78319f490..e40d1a43fe0 100644
--- a/core/amber/src/main/python/pytexera/__init__.py
+++ b/amber/src/main/python/pytexera/__init__.py
@@ -21,12 +21,15 @@
 
 from pyamber import *
 from .storage.dataset_file_document import DatasetFileDocument
+from .storage.large_binary_input_stream import LargeBinaryInputStream
+from .storage.large_binary_output_stream import LargeBinaryOutputStream
 from .udf.udf_operator import (
     UDFOperatorV2,
     UDFTableOperator,
     UDFBatchOperator,
     UDFSourceOperator,
 )
+from core.models.type.large_binary import largebinary
 
 __all__ = [
     "State",
@@ -41,6 +44,9 @@
     "UDFBatchOperator",
     "UDFSourceOperator",
     "DatasetFileDocument",
+    "largebinary",
+    "LargeBinaryInputStream",
+    "LargeBinaryOutputStream",
     # export external tools to be used
     "overrides",
     "logger",
diff --git a/core/amber/src/main/python/pytexera/storage/__init__.py b/amber/src/main/python/pytexera/storage/__init__.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/storage/__init__.py
rename to amber/src/main/python/pytexera/storage/__init__.py
diff --git a/core/amber/src/main/python/pytexera/storage/dataset_file_document.py b/amber/src/main/python/pytexera/storage/dataset_file_document.py
similarity index 96%
rename from core/amber/src/main/python/pytexera/storage/dataset_file_document.py
rename to amber/src/main/python/pytexera/storage/dataset_file_document.py
index 28ffe0d30e5..3d077735833 100644
--- a/core/amber/src/main/python/pytexera/storage/dataset_file_document.py
+++ b/amber/src/main/python/pytexera/storage/dataset_file_document.py
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import os
 import io
+import os
 import requests
 import urllib.parse
 
@@ -73,8 +73,7 @@ def get_presigned_url(self) -> str:
 
         if response.status_code != 200:
             raise RuntimeError(
-                f"Failed to get presigned URL: "
-                f"{response.status_code} {response.text}"
+                f"Failed to get presigned URL: {response.status_code} {response.text}"
             )
 
         return response.json().get("presignedUrl")
diff --git a/amber/src/main/python/pytexera/storage/large_binary_input_stream.py b/amber/src/main/python/pytexera/storage/large_binary_input_stream.py
new file mode 100644
index 00000000000..8e7d8640403
--- /dev/null
+++ b/amber/src/main/python/pytexera/storage/large_binary_input_stream.py
@@ -0,0 +1,121 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+LargeBinaryInputStream for reading largebinary data from S3.
+
+Usage:
+    with LargeBinaryInputStream(large_binary) as stream:
+        content = stream.read()
+"""
+
+from typing import BinaryIO, Optional
+from functools import wraps
+from io import IOBase
+from core.models.type.large_binary import largebinary
+
+
+def _require_open(func):
+    """Decorator to ensure stream is open before reading operations."""
+
+    @wraps(func)
+    def wrapper(self, *args, **kwargs):
+        if self._closed:
+            raise ValueError("I/O operation on closed stream")
+        if self._underlying is None:
+            self._lazy_init()
+        return func(self, *args, **kwargs)
+
+    return wrapper
+
+
+class LargeBinaryInputStream(IOBase):
+    """
+    InputStream for reading largebinary data from S3.
+
+    Lazily downloads from S3 on first read. Supports context manager and iteration.
+    """
+
+    def __init__(self, large_binary: largebinary):
+        """Initialize stream for reading the given largebinary."""
+        super().__init__()
+        if large_binary is None:
+            raise ValueError("largebinary cannot be None")
+        self._large_binary = large_binary
+        self._underlying: Optional[BinaryIO] = None
+        self._closed = False
+
+    def _lazy_init(self):
+        """Download from S3 on first read operation."""
+        from pytexera.storage import large_binary_manager
+
+        s3 = large_binary_manager._get_s3_client()
+        response = s3.get_object(
+            Bucket=self._large_binary.get_bucket_name(),
+            Key=self._large_binary.get_object_key(),
+        )
+        self._underlying = response["Body"]
+
+    @_require_open
+    def read(self, n: int = -1) -> bytes:
+        """Read and return up to n bytes (-1 reads all)."""
+        return self._underlying.read(n)
+
+    @_require_open
+    def readline(self, size: int = -1) -> bytes:
+        """Read and return one line from the stream."""
+        return self._underlying.readline(size)
+
+    @_require_open
+    def readlines(self, hint: int = -1) -> list[bytes]:
+        """Read and return a list of lines from the stream."""
+        return self._underlying.readlines(hint)
+
+    def readable(self) -> bool:
+        """Return True if the stream can be read from."""
+        return not self._closed
+
+    def seekable(self) -> bool:
+        """Return False - this stream does not support seeking."""
+        return False
+
+    @property
+    def closed(self) -> bool:
+        """Return True if the stream is closed."""
+        return self._closed
+
+    def close(self) -> None:
+        """Close the stream and release resources."""
+        if not self._closed:
+            self._closed = True
+            if self._underlying is not None:
+                self._underlying.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+
+    def __iter__(self):
+        return self
+
+    def __next__(self) -> bytes:
+        line = self.readline()
+        if not line:
+            raise StopIteration
+        return line
diff --git a/amber/src/main/python/pytexera/storage/large_binary_manager.py b/amber/src/main/python/pytexera/storage/large_binary_manager.py
new file mode 100644
index 00000000000..e061eac6228
--- /dev/null
+++ b/amber/src/main/python/pytexera/storage/large_binary_manager.py
@@ -0,0 +1,78 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Internal largebinary manager for S3 operations.
+
+Users should not interact with this module directly. Use largebinary() constructor
+and LargeBinaryInputStream/LargeBinaryOutputStream instead.
+"""
+
+import time
+import uuid
+from loguru import logger
+from core.storage.storage_config import StorageConfig
+
+# Module-level state
+_s3_client = None
+DEFAULT_BUCKET = "texera-large-binaries"
+
+
+def _get_s3_client():
+    """Get or initialize S3 client (lazy initialization, cached)."""
+    global _s3_client
+    if _s3_client is None:
+        try:
+            import boto3
+            from botocore.config import Config
+        except ImportError as e:
+            raise RuntimeError("boto3 required. Install with: pip install boto3") from e
+
+        _s3_client = boto3.client(
+            "s3",
+            endpoint_url=StorageConfig.S3_ENDPOINT,
+            aws_access_key_id=StorageConfig.S3_AUTH_USERNAME,
+            aws_secret_access_key=StorageConfig.S3_AUTH_PASSWORD,
+            region_name=StorageConfig.S3_REGION,
+            config=Config(signature_version="s3v4", s3={"addressing_style": "path"}),
+        )
+    return _s3_client
+
+
+def _ensure_bucket_exists(bucket: str):
+    """Ensure S3 bucket exists, creating it if necessary."""
+    s3 = _get_s3_client()
+    try:
+        s3.head_bucket(Bucket=bucket)
+    except s3.exceptions.NoSuchBucket:
+        logger.debug(f"Bucket {bucket} not found, creating it")
+        s3.create_bucket(Bucket=bucket)
+        logger.info(f"Created bucket: {bucket}")
+
+
+def create() -> str:
+    """
+    Creates a new largebinary reference with a unique S3 URI.
+
+    Returns:
+        S3 URI string (format: s3://bucket/key)
+    """
+    _ensure_bucket_exists(DEFAULT_BUCKET)
+    timestamp_ms = int(time.time() * 1000)
+    unique_id = uuid.uuid4()
+    object_key = f"objects/{timestamp_ms}/{unique_id}"
+    return f"s3://{DEFAULT_BUCKET}/{object_key}"
diff --git a/amber/src/main/python/pytexera/storage/large_binary_output_stream.py b/amber/src/main/python/pytexera/storage/large_binary_output_stream.py
new file mode 100644
index 00000000000..af4f1a275c2
--- /dev/null
+++ b/amber/src/main/python/pytexera/storage/large_binary_output_stream.py
@@ -0,0 +1,244 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+LargeBinaryOutputStream for streaming largebinary data to S3.
+
+Usage:
+    from pytexera import largebinary, LargeBinaryOutputStream
+
+    large_binary = largebinary()
+    with LargeBinaryOutputStream(large_binary) as out:
+        out.write(b"data")
+"""
+
+from typing import Optional, Union
+from io import IOBase
+from core.models.type.large_binary import largebinary
+from pytexera.storage import large_binary_manager
+import threading
+import queue
+
+# Constants
+_CHUNK_SIZE = 64 * 1024  # 64KB
+_QUEUE_TIMEOUT = 0.1
+
+
+class _QueueReader:
+    """File-like object that reads from a queue."""
+
+    def __init__(self, q: queue.Queue):
+        self._queue = q
+        self._buffer = b""
+        self._eof = False
+
+    def read(self, size=-1):
+        """Read bytes from the queue."""
+        if self._eof and not self._buffer:
+            return b""
+
+        # Collect chunks until we have enough data or reach EOF
+        chunks = [self._buffer] if self._buffer else []
+        total_size = len(self._buffer)
+        self._buffer = b""
+        needed = size if size != -1 else None
+
+        while not self._eof and (needed is None or total_size < needed):
+            try:
+                chunk = self._queue.get(timeout=_QUEUE_TIMEOUT)
+                if chunk is None:  # EOF marker
+                    self._eof = True
+                    break
+                chunks.append(chunk)
+                total_size += len(chunk)
+            except queue.Empty:
+                continue
+
+        result = b"".join(chunks)
+
+        # If size was specified, split and buffer remainder
+        if needed is not None and len(result) > needed:
+            self._buffer = result[needed:]
+            result = result[:needed]
+
+        return result
+
+
+class LargeBinaryOutputStream(IOBase):
+    """
+    OutputStream for streaming largebinary data to S3.
+
+    Data is uploaded in the background using multipart upload as you write.
+    Call close() to complete the upload and ensure all data is persisted.
+
+    This class follows Python's standard I/O interface (io.IOBase).
+
+    Usage:
+        from pytexera import largebinary, LargeBinaryOutputStream
+
+        # Create a new largebinary and write to it
+        large_binary = largebinary()
+        with LargeBinaryOutputStream(large_binary) as out:
+            out.write(b"Hello, World!")
+            out.write(b"More data")
+        # large_binary is now ready to be added to tuples
+
+    Note: Not thread-safe. Do not access from multiple threads concurrently.
+    """
+
+    def __init__(self, large_binary: largebinary):
+        """
+        Initialize a LargeBinaryOutputStream.
+
+        Args:
+            large_binary: The largebinary reference to write to
+
+        Raises:
+            ValueError: If large_binary is None
+        """
+        super().__init__()
+        if large_binary is None:
+            raise ValueError("largebinary cannot be None")
+
+        self._large_binary = large_binary
+        self._bucket_name = large_binary.get_bucket_name()
+        self._object_key = large_binary.get_object_key()
+        self._closed = False
+
+        # Background upload thread state
+        self._queue: queue.Queue = queue.Queue(maxsize=_CHUNK_SIZE)
+        self._upload_exception: Optional[Exception] = None
+        self._upload_complete = threading.Event()
+        self._upload_thread: Optional[threading.Thread] = None
+        self._lock = threading.Lock()
+
+    def write(self, b: Union[bytes, bytearray]) -> int:
+        """
+        Write bytes to the stream.
+
+        Args:
+            b: Bytes to write
+
+        Returns:
+            Number of bytes written
+
+        Raises:
+            ValueError: If stream is closed
+            IOError: If previous upload failed
+        """
+        if self._closed:
+            raise ValueError("I/O operation on closed stream")
+
+        # Check if upload has failed
+        with self._lock:
+            if self._upload_exception is not None:
+                raise IOError(
+                    f"Background upload failed: {self._upload_exception}"
+                ) from self._upload_exception
+
+        # Start upload thread on first write
+        if self._upload_thread is None:
+
+            def upload_worker():
+                try:
+                    large_binary_manager._ensure_bucket_exists(self._bucket_name)
+                    s3 = large_binary_manager._get_s3_client()
+                    reader = _QueueReader(self._queue)
+                    s3.upload_fileobj(reader, self._bucket_name, self._object_key)
+                except Exception as e:
+                    with self._lock:
+                        self._upload_exception = e
+                finally:
+                    self._upload_complete.set()
+
+            self._upload_thread = threading.Thread(target=upload_worker, daemon=True)
+            self._upload_thread.start()
+
+        # Write data in chunks
+        data = bytes(b)
+        for offset in range(0, len(data), _CHUNK_SIZE):
+            self._queue.put(data[offset : offset + _CHUNK_SIZE], block=True)
+
+        return len(data)
+
+    def writable(self) -> bool:
+        """Return True if the stream can be written to."""
+        return not self._closed
+
+    def seekable(self) -> bool:
+        """Return False - this stream does not support seeking."""
+        return False
+
+    @property
+    def closed(self) -> bool:
+        """Return True if the stream is closed."""
+        return self._closed
+
+    def flush(self) -> None:
+        """
+        Flush the write buffer.
+
+        Note: This doesn't guarantee data is uploaded to S3 yet.
+        Call close() to ensure upload completion.
+        """
+        # No-op: data is already being consumed by the upload thread
+        pass
+
+    def close(self) -> None:
+        """
+        Close the stream and complete the S3 upload.
+        Blocks until upload is complete. Raises IOError if upload failed.
+
+        Raises:
+            IOError: If upload failed
+        """
+        if self._closed:
+            return
+
+        self._closed = True
+
+        # Signal EOF to upload thread and wait for completion
+        if self._upload_thread is not None:
+            self._queue.put(None, block=True)  # EOF marker
+            self._upload_thread.join()
+            self._upload_complete.wait()
+
+            # Check for errors and cleanup if needed
+            with self._lock:
+                exception = self._upload_exception
+
+            if exception is not None:
+                self._cleanup_failed_upload()
+                raise IOError(f"Failed to complete upload: {exception}") from exception
+
+    def _cleanup_failed_upload(self):
+        """Clean up a failed upload by deleting the S3 object."""
+        try:
+            s3 = large_binary_manager._get_s3_client()
+            s3.delete_object(Bucket=self._bucket_name, Key=self._object_key)
+        except Exception:
+            # Ignore cleanup errors - we're already handling an upload failure
+            pass
+
+    def __enter__(self):
+        """Context manager entry."""
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """Context manager exit - automatically cleanup."""
+        self.close()
+        return False
diff --git a/amber/src/main/python/pytexera/storage/test_large_binary_input_stream.py b/amber/src/main/python/pytexera/storage/test_large_binary_input_stream.py
new file mode 100644
index 00000000000..85bdbd13fa1
--- /dev/null
+++ b/amber/src/main/python/pytexera/storage/test_large_binary_input_stream.py
@@ -0,0 +1,222 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+from unittest.mock import patch, MagicMock
+from io import BytesIO
+from core.models.type.large_binary import largebinary
+from pytexera.storage.large_binary_input_stream import LargeBinaryInputStream
+from pytexera.storage import large_binary_manager
+
+
+class TestLargeBinaryInputStream:
+    @pytest.fixture
+    def large_binary(self):
+        """Create a test largebinary."""
+        return largebinary("s3://test-bucket/path/to/object")
+
+    @pytest.fixture
+    def mock_s3_response(self):
+        """Create a mock S3 response with a BytesIO body."""
+        return {"Body": BytesIO(b"test data content")}
+
+    def test_init_with_valid_large_binary(self, large_binary):
+        """Test initialization with a valid largebinary."""
+        stream = LargeBinaryInputStream(large_binary)
+        try:
+            assert stream._large_binary == large_binary
+            assert stream._underlying is None
+            assert not stream._closed
+        finally:
+            stream.close()
+
+    def test_init_with_none_raises_error(self):
+        """Test that initializing with None raises ValueError."""
+        with pytest.raises(ValueError, match="largebinary cannot be None"):
+            LargeBinaryInputStream(None)
+
+    def test_lazy_init_downloads_from_s3(self, large_binary, mock_s3_response):
+        """Test that _lazy_init downloads from S3 on first read."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = mock_s3_response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            try:
+                assert stream._underlying is None  # Not initialized yet
+
+                # Trigger lazy init by reading
+                data = stream.read()
+                assert data == b"test data content"
+                assert stream._underlying is not None
+
+                # Verify S3 was called correctly
+                mock_s3_client.get_object.assert_called_once_with(
+                    Bucket="test-bucket", Key="path/to/object"
+                )
+            finally:
+                stream.close()
+
+    def test_read_all(self, large_binary, mock_s3_response):
+        """Test reading all data."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = mock_s3_response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            try:
+                data = stream.read()
+                assert data == b"test data content"
+            finally:
+                stream.close()
+
+    def test_read_partial(self, large_binary, mock_s3_response):
+        """Test reading partial data."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = mock_s3_response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            try:
+                data = stream.read(4)
+                assert data == b"test"
+            finally:
+                stream.close()
+
+    def test_readline(self, large_binary):
+        """Test reading a line."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            response = {"Body": BytesIO(b"line1\nline2\nline3")}
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            try:
+                line = stream.readline()
+                assert line == b"line1\n"
+            finally:
+                stream.close()
+
+    def test_readlines(self, large_binary):
+        """Test reading all lines."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            response = {"Body": BytesIO(b"line1\nline2\nline3")}
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            try:
+                lines = stream.readlines()
+                assert lines == [b"line1\n", b"line2\n", b"line3"]
+            finally:
+                stream.close()
+
+    def test_readable(self, large_binary):
+        """Test readable() method."""
+        stream = LargeBinaryInputStream(large_binary)
+        try:
+            assert stream.readable() is True
+
+            stream.close()
+            assert stream.readable() is False
+        finally:
+            if not stream._closed:
+                stream.close()
+
+    def test_seekable(self, large_binary):
+        """Test seekable() method (should always return False)."""
+        stream = LargeBinaryInputStream(large_binary)
+        try:
+            assert stream.seekable() is False
+        finally:
+            stream.close()
+
+    def test_closed_property(self, large_binary):
+        """Test closed property."""
+        stream = LargeBinaryInputStream(large_binary)
+        try:
+            assert stream.closed is False
+
+            stream.close()
+            assert stream.closed is True
+        finally:
+            if not stream._closed:
+                stream.close()
+
+    def test_close(self, large_binary, mock_s3_response):
+        """Test closing the stream."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = mock_s3_response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            stream.read(1)  # Trigger lazy init
+            assert stream._underlying is not None
+
+            stream.close()
+            assert stream._closed is True
+            assert stream._underlying.closed
+
+    def test_context_manager(self, large_binary, mock_s3_response):
+        """Test using as context manager."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = mock_s3_response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            with LargeBinaryInputStream(large_binary) as stream:
+                data = stream.read()
+                assert data == b"test data content"
+                assert not stream._closed
+
+            # Stream should be closed after context exit
+            assert stream._closed
+
+    def test_iteration(self, large_binary):
+        """Test iteration over lines."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            response = {"Body": BytesIO(b"line1\nline2\nline3")}
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            try:
+                lines = list(stream)
+                assert lines == [b"line1\n", b"line2\n", b"line3"]
+            finally:
+                stream.close()
+
+    def test_read_after_close_raises_error(self, large_binary, mock_s3_response):
+        """Test that reading after close raises ValueError."""
+        with patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client:
+            mock_s3_client = MagicMock()
+            mock_s3_client.get_object.return_value = mock_s3_response
+            mock_get_s3_client.return_value = mock_s3_client
+
+            stream = LargeBinaryInputStream(large_binary)
+            stream.close()
+
+            with pytest.raises(ValueError, match="I/O operation on closed stream"):
+                stream.read()
+            # Stream is already closed, no need to close again
diff --git a/amber/src/main/python/pytexera/storage/test_large_binary_manager.py b/amber/src/main/python/pytexera/storage/test_large_binary_manager.py
new file mode 100644
index 00000000000..a657f244f38
--- /dev/null
+++ b/amber/src/main/python/pytexera/storage/test_large_binary_manager.py
@@ -0,0 +1,150 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+from unittest.mock import patch, MagicMock
+from pytexera.storage import large_binary_manager
+from core.storage.storage_config import StorageConfig
+
+
+class TestLargeBinaryManager:
+    @pytest.fixture(autouse=True)
+    def setup_storage_config(self):
+        """Initialize StorageConfig for tests."""
+        if not StorageConfig._initialized:
+            StorageConfig.initialize(
+                postgres_uri_without_scheme="localhost:5432/test",
+                postgres_username="test",
+                postgres_password="test",
+                table_result_namespace="test",
+                directory_path="/tmp/test",
+                commit_batch_size=1000,
+                s3_endpoint="http://localhost:9000",
+                s3_region="us-east-1",
+                s3_auth_username="minioadmin",
+                s3_auth_password="minioadmin",
+            )
+
+    def test_get_s3_client_initializes_once(self):
+        """Test that S3 client is initialized and cached."""
+        # Reset the client
+        large_binary_manager._s3_client = None
+
+        with patch("boto3.client") as mock_boto3_client:
+            mock_client = MagicMock()
+            mock_boto3_client.return_value = mock_client
+
+            # First call should create client
+            client1 = large_binary_manager._get_s3_client()
+            assert client1 == mock_client
+            assert mock_boto3_client.call_count == 1
+
+            # Second call should return cached client
+            client2 = large_binary_manager._get_s3_client()
+            assert client2 == mock_client
+            assert mock_boto3_client.call_count == 1  # Still 1, not 2
+
+    def test_get_s3_client_without_boto3_raises_error(self):
+        """Test that missing boto3 raises RuntimeError."""
+        large_binary_manager._s3_client = None
+
+        import sys
+
+        # Temporarily remove boto3 from sys.modules to simulate it not being installed
+        boto3_backup = sys.modules.pop("boto3", None)
+        try:
+            # Mock the import to raise ImportError
+            original_import = __import__
+
+            def mock_import(name, *args, **kwargs):
+                if name == "boto3":
+                    raise ImportError("No module named boto3")
+                return original_import(name, *args, **kwargs)
+
+            with patch("builtins.__import__", side_effect=mock_import):
+                with pytest.raises(RuntimeError, match="boto3 required"):
+                    large_binary_manager._get_s3_client()
+        finally:
+            # Restore boto3 if it was there
+            if boto3_backup is not None:
+                sys.modules["boto3"] = boto3_backup
+
+    def test_ensure_bucket_exists_when_bucket_exists(self):
+        """Test that existing bucket doesn't trigger creation."""
+        large_binary_manager._s3_client = None
+
+        with patch("boto3.client") as mock_boto3_client:
+            mock_client = MagicMock()
+            mock_boto3_client.return_value = mock_client
+            # head_bucket doesn't raise exception (bucket exists)
+            mock_client.head_bucket.return_value = None
+            mock_client.exceptions.NoSuchBucket = type("NoSuchBucket", (Exception,), {})
+
+            large_binary_manager._ensure_bucket_exists("test-bucket")
+            mock_client.head_bucket.assert_called_once_with(Bucket="test-bucket")
+            mock_client.create_bucket.assert_not_called()
+
+    def test_ensure_bucket_exists_creates_bucket_when_missing(self):
+        """Test that missing bucket triggers creation."""
+        large_binary_manager._s3_client = None
+
+        with patch("boto3.client") as mock_boto3_client:
+            mock_client = MagicMock()
+            mock_boto3_client.return_value = mock_client
+            # head_bucket raises NoSuchBucket exception
+            no_such_bucket = type("NoSuchBucket", (Exception,), {})
+            mock_client.exceptions.NoSuchBucket = no_such_bucket
+            mock_client.head_bucket.side_effect = no_such_bucket()
+
+            large_binary_manager._ensure_bucket_exists("test-bucket")
+            mock_client.head_bucket.assert_called_once_with(Bucket="test-bucket")
+            mock_client.create_bucket.assert_called_once_with(Bucket="test-bucket")
+
+    def test_create_generates_unique_uri(self):
+        """Test that create() generates a unique S3 URI."""
+        large_binary_manager._s3_client = None
+
+        with patch("boto3.client") as mock_boto3_client:
+            mock_client = MagicMock()
+            mock_boto3_client.return_value = mock_client
+            mock_client.head_bucket.return_value = None
+            mock_client.exceptions.NoSuchBucket = type("NoSuchBucket", (Exception,), {})
+
+            uri = large_binary_manager.create()
+
+            # Check URI format
+            assert uri.startswith("s3://")
+            assert uri.startswith(f"s3://{large_binary_manager.DEFAULT_BUCKET}/")
+            assert "objects/" in uri
+
+            # Verify bucket was checked/created
+            mock_client.head_bucket.assert_called_once_with(
+                Bucket=large_binary_manager.DEFAULT_BUCKET
+            )
+
+    def test_create_uses_default_bucket(self):
+        """Test that create() uses the default bucket."""
+        large_binary_manager._s3_client = None
+
+        with patch("boto3.client") as mock_boto3_client:
+            mock_client = MagicMock()
+            mock_boto3_client.return_value = mock_client
+            mock_client.head_bucket.return_value = None
+            mock_client.exceptions.NoSuchBucket = type("NoSuchBucket", (Exception,), {})
+
+            uri = large_binary_manager.create()
+            assert large_binary_manager.DEFAULT_BUCKET in uri
diff --git a/amber/src/main/python/pytexera/storage/test_large_binary_output_stream.py b/amber/src/main/python/pytexera/storage/test_large_binary_output_stream.py
new file mode 100644
index 00000000000..7ebcc9b4cfd
--- /dev/null
+++ b/amber/src/main/python/pytexera/storage/test_large_binary_output_stream.py
@@ -0,0 +1,238 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+import time
+from unittest.mock import patch, MagicMock
+from core.models.type.large_binary import largebinary
+from pytexera.storage.large_binary_output_stream import LargeBinaryOutputStream
+from pytexera.storage import large_binary_manager
+
+
+class TestLargeBinaryOutputStream:
+    @pytest.fixture
+    def large_binary(self):
+        """Create a test largebinary."""
+        return largebinary("s3://test-bucket/path/to/object")
+
+    def test_init_with_valid_large_binary(self, large_binary):
+        """Test initialization with a valid largebinary."""
+        stream = LargeBinaryOutputStream(large_binary)
+        assert stream._large_binary == large_binary
+        assert stream._bucket_name == "test-bucket"
+        assert stream._object_key == "path/to/object"
+        assert not stream._closed
+        assert stream._upload_thread is None
+
+    def test_init_with_none_raises_error(self):
+        """Test that initializing with None raises ValueError."""
+        with pytest.raises(ValueError, match="largebinary cannot be None"):
+            LargeBinaryOutputStream(None)
+
+    def test_write_starts_upload_thread(self, large_binary):
+        """Test that write() starts the upload thread."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+
+            stream = LargeBinaryOutputStream(large_binary)
+            assert stream._upload_thread is None
+
+            stream.write(b"test data")
+            assert stream._upload_thread is not None
+            # Thread may have already completed, so just check it was created
+            assert stream._upload_thread is not None
+
+            # Wait for thread to finish
+            stream.close()
+
+    def test_write_data(self, large_binary):
+        """Test writing data to the stream."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+
+            stream = LargeBinaryOutputStream(large_binary)
+            bytes_written = stream.write(b"test data")
+            assert bytes_written == len(b"test data")
+
+            stream.close()
+
+    def test_write_multiple_chunks(self, large_binary):
+        """Test writing multiple chunks of data."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+
+            stream = LargeBinaryOutputStream(large_binary)
+            stream.write(b"chunk1")
+            stream.write(b"chunk2")
+            stream.write(b"chunk3")
+
+            stream.close()
+
+    def test_writable(self, large_binary):
+        """Test writable() method."""
+        stream = LargeBinaryOutputStream(large_binary)
+        assert stream.writable() is True
+
+        stream.close()
+        assert stream.writable() is False
+
+    def test_seekable(self, large_binary):
+        """Test seekable() method (should always return False)."""
+        stream = LargeBinaryOutputStream(large_binary)
+        assert stream.seekable() is False
+
+    def test_closed_property(self, large_binary):
+        """Test closed property."""
+        stream = LargeBinaryOutputStream(large_binary)
+        assert stream.closed is False
+
+        stream.close()
+        assert stream.closed is True
+
+    def test_flush(self, large_binary):
+        """Test flush() method (should be a no-op)."""
+        stream = LargeBinaryOutputStream(large_binary)
+        # Should not raise any exception
+        stream.flush()
+
+    def test_close_completes_upload(self, large_binary):
+        """Test that close() completes the upload."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+
+            stream = LargeBinaryOutputStream(large_binary)
+            stream.write(b"test data")
+
+            # Close should wait for upload to complete
+            stream.close()
+
+            # Verify upload_fileobj was called
+            assert mock_s3.upload_fileobj.called
+
+    def test_context_manager(self, large_binary):
+        """Test using as context manager."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+
+            with LargeBinaryOutputStream(large_binary) as stream:
+                stream.write(b"test data")
+                assert not stream._closed
+
+            # Stream should be closed after context exit
+            assert stream._closed
+
+    def test_write_after_close_raises_error(self, large_binary):
+        """Test that writing after close raises ValueError."""
+        stream = LargeBinaryOutputStream(large_binary)
+        stream.close()
+
+        with pytest.raises(ValueError, match="I/O operation on closed stream"):
+            stream.write(b"data")
+
+    def test_close_handles_upload_error(self, large_binary):
+        """Test that close() raises IOError if upload fails."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+            mock_s3.upload_fileobj.side_effect = Exception("Upload failed")
+
+            stream = LargeBinaryOutputStream(large_binary)
+            stream.write(b"test data")
+
+            with pytest.raises(IOError, match="Failed to complete upload"):
+                stream.close()
+
+    def test_write_after_upload_error_raises_error(self, large_binary):
+        """Test that writing after upload error raises IOError."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+            mock_s3.upload_fileobj.side_effect = Exception("Upload failed")
+
+            stream = LargeBinaryOutputStream(large_binary)
+            stream.write(b"test data")
+
+            # Wait a bit for the error to be set
+            time.sleep(0.1)
+
+            with pytest.raises(IOError, match="Background upload failed"):
+                stream.write(b"more data")
+
+    def test_multiple_close_calls(self, large_binary):
+        """Test that multiple close() calls are safe."""
+        with (
+            patch.object(large_binary_manager, "_get_s3_client") as mock_get_s3_client,
+            patch.object(
+                large_binary_manager, "_ensure_bucket_exists"
+            ) as mock_ensure_bucket,
+        ):
+            mock_s3 = MagicMock()
+            mock_get_s3_client.return_value = mock_s3
+            mock_ensure_bucket.return_value = None
+
+            stream = LargeBinaryOutputStream(large_binary)
+            stream.write(b"test data")
+            stream.close()
+            # Second close should not raise error
+            stream.close()
diff --git a/core/amber/src/main/python/proto/__init__.py b/amber/src/main/python/pytexera/udf/__init__.py
similarity index 100%
rename from core/amber/src/main/python/proto/__init__.py
rename to amber/src/main/python/pytexera/udf/__init__.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/__init__.py b/amber/src/main/python/pytexera/udf/examples/__init__.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/__init__.py
rename to amber/src/main/python/pytexera/udf/examples/__init__.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/count_batch_operator.py b/amber/src/main/python/pytexera/udf/examples/count_batch_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/count_batch_operator.py
rename to amber/src/main/python/pytexera/udf/examples/count_batch_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/echo_operator.py b/amber/src/main/python/pytexera/udf/examples/echo_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/echo_operator.py
rename to amber/src/main/python/pytexera/udf/examples/echo_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/echo_table_operator.py b/amber/src/main/python/pytexera/udf/examples/echo_table_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/echo_table_operator.py
rename to amber/src/main/python/pytexera/udf/examples/echo_table_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/generator_operator_binary.py b/amber/src/main/python/pytexera/udf/examples/generator_operator_binary.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/generator_operator_binary.py
rename to amber/src/main/python/pytexera/udf/examples/generator_operator_binary.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/generator_operator_integer.py b/amber/src/main/python/pytexera/udf/examples/generator_operator_integer.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/generator_operator_integer.py
rename to amber/src/main/python/pytexera/udf/examples/generator_operator_integer.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/join_operator.py b/amber/src/main/python/pytexera/udf/examples/join_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/join_operator.py
rename to amber/src/main/python/pytexera/udf/examples/join_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/rudf/r_table_operator.py b/amber/src/main/python/pytexera/udf/examples/rudf/r_table_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/rudf/r_table_operator.py
rename to amber/src/main/python/pytexera/udf/examples/rudf/r_table_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/rudf/r_tuple_operator.py b/amber/src/main/python/pytexera/udf/examples/rudf/r_tuple_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/rudf/r_tuple_operator.py
rename to amber/src/main/python/pytexera/udf/examples/rudf/r_tuple_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/test_count_batch_operator.py b/amber/src/main/python/pytexera/udf/examples/test_count_batch_operator.py
similarity index 99%
rename from core/amber/src/main/python/pytexera/udf/examples/test_count_batch_operator.py
rename to amber/src/main/python/pytexera/udf/examples/test_count_batch_operator.py
index 3df28259400..9ab084a4050 100644
--- a/core/amber/src/main/python/pytexera/udf/examples/test_count_batch_operator.py
+++ b/amber/src/main/python/pytexera/udf/examples/test_count_batch_operator.py
@@ -16,9 +16,8 @@
 # under the License.
 
 import inspect
-from collections import deque
-
 import pytest
+from collections import deque
 
 from pytexera import *
 from .count_batch_operator import CountBatchOperator
diff --git a/core/amber/src/main/python/pytexera/udf/examples/test_echo_operator.py b/amber/src/main/python/pytexera/udf/examples/test_echo_operator.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/test_echo_operator.py
rename to amber/src/main/python/pytexera/udf/examples/test_echo_operator.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/test_echo_table_operator.py b/amber/src/main/python/pytexera/udf/examples/test_echo_table_operator.py
similarity index 99%
rename from core/amber/src/main/python/pytexera/udf/examples/test_echo_table_operator.py
rename to amber/src/main/python/pytexera/udf/examples/test_echo_table_operator.py
index b878d8dec91..d619f53a66b 100644
--- a/core/amber/src/main/python/pytexera/udf/examples/test_echo_table_operator.py
+++ b/amber/src/main/python/pytexera/udf/examples/test_echo_table_operator.py
@@ -15,9 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from collections import deque
-
 import pytest
+from collections import deque
 
 from core.models.table import all_output_to_tuple
 from pytexera import Tuple
diff --git a/core/amber/src/main/python/pytexera/udf/examples/test_generator_operator_binary.py b/amber/src/main/python/pytexera/udf/examples/test_generator_operator_binary.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/test_generator_operator_binary.py
rename to amber/src/main/python/pytexera/udf/examples/test_generator_operator_binary.py
diff --git a/core/amber/src/main/python/pytexera/udf/examples/test_generator_operator_integer.py b/amber/src/main/python/pytexera/udf/examples/test_generator_operator_integer.py
similarity index 100%
rename from core/amber/src/main/python/pytexera/udf/examples/test_generator_operator_integer.py
rename to amber/src/main/python/pytexera/udf/examples/test_generator_operator_integer.py
diff --git a/core/amber/src/main/python/pytexera/udf/udf_operator.py b/amber/src/main/python/pytexera/udf/udf_operator.py
similarity index 99%
rename from core/amber/src/main/python/pytexera/udf/udf_operator.py
rename to amber/src/main/python/pytexera/udf/udf_operator.py
index 60dc87308e0..003225c75c3 100644
--- a/core/amber/src/main/python/pytexera/udf/udf_operator.py
+++ b/amber/src/main/python/pytexera/udf/udf_operator.py
@@ -17,6 +17,7 @@
 
 from abc import abstractmethod
 from typing import Iterator, Optional, Union
+
 from pyamber import *
 
 
diff --git a/core/amber/src/main/python/texera_run_python_worker.py b/amber/src/main/python/texera_run_python_worker.py
similarity index 92%
rename from core/amber/src/main/python/texera_run_python_worker.py
rename to amber/src/main/python/texera_run_python_worker.py
index d4854c69c6d..3ebf81c201f 100644
--- a/core/amber/src/main/python/texera_run_python_worker.py
+++ b/amber/src/main/python/texera_run_python_worker.py
@@ -16,7 +16,6 @@
 # under the License.
 
 import sys
-
 from loguru import logger
 
 from core.python_worker import PythonWorker
@@ -52,6 +51,10 @@ def init_loguru_logger(stream_log_level) -> None:
         iceberg_table_namespace,
         iceberg_file_storage_directory_path,
         iceberg_table_commit_batch_size,
+        s3_endpoint,
+        s3_region,
+        s3_auth_username,
+        s3_auth_password,
     ) = sys.argv
     init_loguru_logger(logger_level)
     StorageConfig.initialize(
@@ -61,6 +64,10 @@ def init_loguru_logger(stream_log_level) -> None:
         iceberg_table_namespace,
         iceberg_file_storage_directory_path,
         iceberg_table_commit_batch_size,
+        s3_endpoint,
+        s3_region,
+        s3_auth_username,
+        s3_auth_password,
     )
 
     # Setting R_HOME environment variable for R-UDF usage
diff --git a/core/amber/src/main/resources/cache.ccf b/amber/src/main/resources/cache.ccf
similarity index 100%
rename from core/amber/src/main/resources/cache.ccf
rename to amber/src/main/resources/cache.ccf
diff --git a/core/amber/src/main/resources/computing-unit-master-config.yml b/amber/src/main/resources/computing-unit-master-config.yml
similarity index 96%
rename from core/amber/src/main/resources/computing-unit-master-config.yml
rename to amber/src/main/resources/computing-unit-master-config.yml
index a036e424efe..88253f78126 100644
--- a/core/amber/src/main/resources/computing-unit-master-config.yml
+++ b/amber/src/main/resources/computing-unit-master-config.yml
@@ -40,7 +40,7 @@ logging:
     - type: console
       logFormat: "[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n"
     - type: file
-      currentLogFilename: ../log/computing-unit-master.log
+      currentLogFilename: logs/computing-unit-master.log
       threshold: ALL
       queueSize: 512
       discardingThreshold: 0
diff --git a/core/amber/src/main/resources/gmail/.gitkeep b/amber/src/main/resources/gmail/.gitkeep
similarity index 100%
rename from core/amber/src/main/resources/gmail/.gitkeep
rename to amber/src/main/resources/gmail/.gitkeep
diff --git a/core/amber/src/main/resources/logback.xml b/amber/src/main/resources/logback.xml
similarity index 93%
rename from core/amber/src/main/resources/logback.xml
rename to amber/src/main/resources/logback.xml
index 4faa49cd579..aff1ee485ec 100644
--- a/core/amber/src/main/resources/logback.xml
+++ b/amber/src/main/resources/logback.xml
@@ -30,10 +30,10 @@
 
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>../log/amber-worker.log</file>
+        <file>logs/amber-worker.log</file>
         <immediateFlush>true</immediateFlush>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>../log/amber-worker-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+            <fileNamePattern>logs/amber-worker-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
         </rollingPolicy>
         <encoder>
             <pattern>[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n</pattern>
diff --git a/core/amber/src/main/resources/texera-compiling-service-web-config.yml b/amber/src/main/resources/texera-compiling-service-web-config.yml
similarity index 90%
rename from core/amber/src/main/resources/texera-compiling-service-web-config.yml
rename to amber/src/main/resources/texera-compiling-service-web-config.yml
index 5a5cb886e59..94a00fc4537 100644
--- a/core/amber/src/main/resources/texera-compiling-service-web-config.yml
+++ b/amber/src/main/resources/texera-compiling-service-web-config.yml
@@ -31,12 +31,12 @@ server:
     appenders:
       - type: console
       - type: file
-        currentLogFilename: ../log/access.log
+        currentLogFilename: logs/access.log
         threshold: ALL
         queueSize: 512
         discardingThreshold: 0
         archive: true
-        archivedLogFilenamePattern: ../log/access-%d{yyyy-MM-dd}.log.gz
+        archivedLogFilenamePattern: logs/access-%d{yyyy-MM-dd}.log.gz
         archivedFileCount: 7
         bufferSize: 8KiB
         immediateFlush: true
@@ -48,7 +48,7 @@ logging:
     - type: console
       logFormat: "[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n"
     - type: file
-      currentLogFilename: ../log/texera-workflow-compiling-service.log
+      currentLogFilename: logs/texera-workflow-compiling-service.log
       threshold: ALL
       queueSize: 512
       discardingThreshold: 0
diff --git a/core/amber/src/main/resources/web-config.yml b/amber/src/main/resources/web-config.yml
similarity index 91%
rename from core/amber/src/main/resources/web-config.yml
rename to amber/src/main/resources/web-config.yml
index 60519dc0b3a..c777cecd856 100644
--- a/core/amber/src/main/resources/web-config.yml
+++ b/amber/src/main/resources/web-config.yml
@@ -31,12 +31,12 @@ server:
     appenders:
       - type: console
       - type: file
-        currentLogFilename: ../log/access.log
+        currentLogFilename: logs/access.log
         threshold: ALL
         queueSize: 512
         discardingThreshold: 0
         archive: true
-        archivedLogFilenamePattern: ../log/access-%d{yyyy-MM-dd}.log.gz
+        archivedLogFilenamePattern: logs/access-%d{yyyy-MM-dd}.log.gz
         archivedFileCount: 7
         bufferSize: 8KiB
         immediateFlush: true
@@ -48,7 +48,7 @@ logging:
     - type: console
       logFormat: "[%date{ISO8601}] [%level] [%logger] [%thread] - %msg %n"
     - type: file
-      currentLogFilename: ../log/amber-server.log
+      currentLogFilename: logs/amber-server.log
       threshold: ALL
       queueSize: 512
       discardingThreshold: 0
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala b/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala
rename to amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala
index fe970b0889c..e3e9afab3fb 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala
@@ -17,28 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.clustering
+package org.apache.texera.amber.clustering
 
-import akka.actor.{Actor, Address}
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent._
+import org.apache.pekko.actor.{Actor, Address}
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent._
 import com.google.protobuf.timestamp.Timestamp
 import com.twitter.util.{Await, Future}
-import edu.uci.ics.amber.clustering.ClusterListener.numWorkerNodesInCluster
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
+import org.apache.texera.amber.clustering.ClusterListener.numWorkerNodesInCluster
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
   COMPLETED,
   FAILED
 }
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
-import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
-import edu.uci.ics.texera.web.SessionState
-import edu.uci.ics.texera.web.model.websocket.response.ClusterStatusUpdateEvent
-import edu.uci.ics.texera.web.service.{WorkflowExecutionService, WorkflowService}
-import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.error.ErrorUtils.getStackTraceWithAllCauses
+import org.apache.texera.web.SessionState
+import org.apache.texera.web.model.websocket.response.ClusterStatusUpdateEvent
+import org.apache.texera.web.service.{WorkflowExecutionService, WorkflowService}
+import org.apache.texera.web.storage.ExecutionStateStore.updateWorkflowState
 
 import java.time.Instant
 import scala.collection.mutable.ArrayBuffer
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/clustering/SingleNodeListener.scala b/amber/src/main/scala/org/apache/texera/amber/clustering/SingleNodeListener.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/clustering/SingleNodeListener.scala
rename to amber/src/main/scala/org/apache/texera/amber/clustering/SingleNodeListener.scala
index f896d17e215..282710524ae 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/clustering/SingleNodeListener.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/clustering/SingleNodeListener.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.clustering
+package org.apache.texera.amber.clustering
 
-import akka.actor.{Actor, ActorLogging}
-import edu.uci.ics.amber.clustering.ClusterListener.GetAvailableNodeAddresses
+import org.apache.pekko.actor.{Actor, ActorLogging}
+import org.apache.texera.amber.clustering.ClusterListener.GetAvailableNodeAddresses
 
 class SingleNodeListener extends Actor with ActorLogging {
   override def receive: Receive = {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorRefMappingService.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorRefMappingService.scala
index 778a26718f7..6cad3147031 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorRefMappingService.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
+package org.apache.texera.amber.engine.architecture.common
 
-import akka.actor.ActorRef
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.{
+import org.apache.pekko.actor.ActorRef
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{
   CreditRequest,
   GetActorRef,
   NetworkMessage,
   RegisterActorRef
 }
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF}
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF}
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorService.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorService.scala
index 87f763b5218..10a6d7a38c6 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorService.scala
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
+package org.apache.texera.amber.engine.architecture.common
 
-import akka.actor.{ActorContext, ActorRef, Address, Cancellable, Props}
-import akka.util.Timeout
-import edu.uci.ics.amber.engine.common.FutureBijection._
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.pekko
+import pekko.actor.{ActorContext, ActorRef, Address, Cancellable, Props}
+import pekko.util.Timeout
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.common.FutureBijection._
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.{DurationInt, FiniteDuration}
@@ -78,7 +79,7 @@ class AkkaActorService(val id: ActorVirtualIdentity, actorContext: ActorContext)
   }
 
   def ask(ref: ActorRef, message: Any): com.twitter.util.Future[Any] = {
-    akka.pattern.ask(ref, message).asTwitter()
+    pekko.pattern.ask(ref, message).asTwitter()
   }
 
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaMessageTransferService.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaMessageTransferService.scala
index 487fd4a5f86..3401e3ff639 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaMessageTransferService.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
-
-import akka.actor.Cancellable
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkMessage
-import edu.uci.ics.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl}
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+package org.apache.texera.amber.engine.architecture.common
+
+import org.apache.pekko.actor.Cancellable
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
+import org.apache.texera.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl}
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
 
 import scala.collection.mutable
 import scala.concurrent.duration.DurationInt
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AmberProcessor.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AmberProcessor.scala
index bcee1b896e2..e7763073232 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AmberProcessor.scala
@@ -17,24 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
+package org.apache.texera.amber.engine.architecture.common
 
-import edu.uci.ics.amber.engine.architecture.messaginglayer.{
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.messaginglayer.{
   InputGateway,
   NetworkInputGateway,
   NetworkOutputGateway
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ControlInvocation
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.ReturnInvocation
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
-import edu.uci.ics.amber.engine.architecture.worker.managers.StatisticsManager
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.ambermessage.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ControlInvocation
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.ReturnInvocation
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
+import org.apache.texera.amber.engine.architecture.worker.managers.StatisticsManager
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.ambermessage.{
   DirectControlMessagePayload,
   WorkflowFIFOMessage
 }
-import edu.uci.ics.amber.engine.common.rpc.{AsyncRPCClient, AsyncRPCServer}
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.rpc.{AsyncRPCClient, AsyncRPCServer}
 
 abstract class AmberProcessor(
     val actorId: ActorVirtualIdentity,
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ExecutorDeployment.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ExecutorDeployment.scala
similarity index 77%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ExecutorDeployment.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ExecutorDeployment.scala
index 354999a039f..cf41297c981 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ExecutorDeployment.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ExecutorDeployment.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
+package org.apache.texera.amber.engine.architecture.common
 
-import akka.actor.{Address, Deploy}
-import akka.remote.RemoteScope
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, PreferController, RoundRobinPreference}
-import edu.uci.ics.amber.engine.architecture.controller.execution.OperatorExecution
-import edu.uci.ics.amber.engine.architecture.deploysemantics.AddressInfo
-import edu.uci.ics.amber.engine.architecture.pythonworker.PythonWorkflowWorker
-import edu.uci.ics.amber.engine.architecture.scheduling.config.OperatorConfig
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.pekko.actor.{Address, Deploy}
+import org.apache.pekko.remote.RemoteScope
+import org.apache.texera.amber.core.workflow.{PhysicalOp, PreferController, RoundRobinPreference}
+import org.apache.texera.amber.engine.architecture.controller.execution.OperatorExecution
+import org.apache.texera.amber.engine.architecture.deploysemantics.AddressInfo
+import org.apache.texera.amber.engine.architecture.pythonworker.PythonWorkflowWorker
+import org.apache.texera.amber.engine.architecture.scheduling.config.OperatorConfig
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   FaultToleranceConfig,
   StateRestoreConfig,
   WorkerReplayInitialization
 }
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 object ExecutorDeployment {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ProcessingStepCursor.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ProcessingStepCursor.scala
index 81cc6ecfffb..ac92781737a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ProcessingStepCursor.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
+package org.apache.texera.amber.engine.architecture.common
 
-import edu.uci.ics.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP
 
 object ProcessingStepCursor {
   // step value before processing any incoming message
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/WorkflowActor.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/WorkflowActor.scala
index 40873ce99b9..5ce64a0a3e0 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/WorkflowActor.scala
@@ -17,29 +17,29 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.common
-
-import akka.actor.{Actor, ActorRef, Address, Stash}
-import akka.pattern.ask
-import akka.util.Timeout
-import edu.uci.ics.amber.clustering.ClusterListener.GetAvailableNodeAddresses
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor._
-import edu.uci.ics.amber.engine.architecture.logreplay.{
+package org.apache.texera.amber.engine.architecture.common
+
+import org.apache.pekko.actor.{Actor, ActorRef, Address, Stash}
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.util.Timeout
+import org.apache.texera.amber.clustering.ClusterListener.GetAvailableNodeAddresses
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor._
+import org.apache.texera.amber.engine.architecture.logreplay.{
   ReplayLogGenerator,
   ReplayLogManager,
   ReplayLogRecord,
   ReplayOrderEnforcer
 }
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   FaultToleranceConfig,
   MainThreadDelegateMessage,
   StateRestoreConfig,
   TriggerSend
 }
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.{AmberLogging, CheckpointState}
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.{AmberLogging, CheckpointState}
 
 import scala.concurrent.Await
 import scala.concurrent.duration.DurationInt
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ClientEvent.scala
similarity index 78%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ClientEvent.scala
index d9cfe9c6893..ea83eedd2a9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ClientEvent.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload
-import edu.uci.ics.amber.engine.common.executionruntimestate.OperatorMetrics
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload
+import org.apache.texera.amber.engine.common.executionruntimestate.OperatorMetrics
 
 trait ClientEvent extends WorkflowFIFOMessagePayload
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala
index bd54fd2613e..85ae04d4e9f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala
@@ -17,31 +17,33 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
-
-import akka.actor.SupervisorStrategy.Stop
-import akka.actor.{AllForOneStrategy, Props, SupervisorStrategy}
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.common.{ExecutorDeployment, WorkflowActor}
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkAck
-import edu.uci.ics.amber.engine.architecture.controller.execution.OperatorExecution
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
-  EmbeddedControlMessage,
-  ControlInvocation
+package org.apache.texera.amber.engine.architecture.controller
+
+import org.apache.pekko.actor.SupervisorStrategy.Stop
+import org.apache.pekko.actor.{AllForOneStrategy, Props, SupervisorStrategy}
+import org.apache.texera.web.model.websocket.response.RegionUpdateEvent
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck
+import org.apache.texera.amber.engine.architecture.common.{ExecutorDeployment, WorkflowActor}
+import org.apache.texera.amber.engine.architecture.controller.execution.OperatorExecution
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  ControlInvocation,
+  EmbeddedControlMessage
 }
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   FaultToleranceConfig,
   StateRestoreConfig
 }
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.engine.common.ambermessage.{
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.engine.common.ambermessage.{
   DirectControlMessagePayload,
   WorkflowFIFOMessage
 }
-import edu.uci.ics.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER, SELF}
-import edu.uci.ics.amber.engine.common.{CheckpointState, SerializedState}
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER, SELF}
+import org.apache.texera.amber.engine.common.{CheckpointState, SerializedState}
+import org.apache.texera.web.SessionState
 
 import scala.concurrent.duration.DurationInt
 
@@ -111,6 +113,16 @@ class Controller(
   override def initState(): Unit = {
     attachRuntimeServicesToCPState()
     cp.workflowScheduler.updateSchedule(physicalPlan)
+
+    val regions: List[(Long, List[String])] =
+      cp.workflowScheduler.getSchedule.getRegions.map { region =>
+        (region.id.id, region.physicalOps.map(_.id.logicalOpId.id).toList)
+      }
+
+    SessionState.getAllSessionStates.foreach { state =>
+      state.send(RegionUpdateEvent(regions))
+    }
+
     val controllerRestoreConf = controllerConfig.stateRestoreConfOpt
     if (controllerRestoreConf.isDefined) {
       globalReplayManager.markRecoveryStatus(CONTROLLER, isRecovering = true)
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala
similarity index 75%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala
index c1975ac350e..4d9a36bab43 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.promisehandlers._
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext
-import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCHandlerInitializer
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.controller.promisehandlers._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext
+import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCHandlerInitializer
 
 class ControllerAsyncRPCHandlerInitializer(
     val cp: ControllerProcessor
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerProcessor.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerProcessor.scala
index 1249174b6be..7a8e94cf3a7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerProcessor.scala
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.architecture.common.{
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.engine.architecture.common.{
   AkkaActorRefMappingService,
   AkkaActorService,
   AkkaMessageTransferService,
   AmberProcessor
 }
-import edu.uci.ics.amber.engine.architecture.controller.execution.WorkflowExecution
-import edu.uci.ics.amber.engine.architecture.logreplay.ReplayLogManager
-import edu.uci.ics.amber.engine.architecture.scheduling.WorkflowExecutionCoordinator
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.controller.execution.WorkflowExecution
+import org.apache.texera.amber.engine.architecture.logreplay.ReplayLogManager
+import org.apache.texera.amber.engine.architecture.scheduling.WorkflowExecutionCoordinator
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
 
 class ControllerProcessor(
     workflowContext: WorkflowContext,
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerTimerService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerTimerService.scala
similarity index 77%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerTimerService.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerTimerService.scala
index a7c610e1657..20ebff9fc01 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerTimerService.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerTimerService.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import akka.actor.Cancellable
-import edu.uci.ics.amber.engine.architecture.common.AkkaActorService
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.pekko.actor.Cancellable
+import org.apache.texera.amber.engine.architecture.common.AkkaActorService
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   QueryStatisticsRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_CONTROLLER_INITIATE_QUERY_STATISTICS
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
+import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_CONTROLLER_INITIATE_QUERY_STATISTICS
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
 
 import scala.concurrent.duration.{DurationInt, FiniteDuration, MILLISECONDS}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/GlobalReplayManager.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/GlobalReplayManager.scala
index 873fc09bbae..b8dc3fb6072 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/GlobalReplayManager.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Workflow.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Workflow.scala
index fd72206dcb2..4c2220ae9aa 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Workflow.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.texera.workflow.LogicalPlan
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.workflow.LogicalPlan
 
 case class Workflow(
     context: WorkflowContext,
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/WorkflowScheduler.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/WorkflowScheduler.scala
index 732b970f03e..9dcf3ad4bfc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/WorkflowScheduler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.scheduling.{
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.scheduling.{
   CostBasedScheduleGenerator,
   Region,
   Schedule
@@ -34,6 +34,8 @@ class WorkflowScheduler(
   var physicalPlan: PhysicalPlan = _
   private var schedule: Schedule = _
 
+  def getSchedule: Schedule = schedule
+
   /**
     * Update the schedule to be executed, based on the given physicalPlan.
     */
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ChannelExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ChannelExecution.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ChannelExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ChannelExecution.scala
index 2b290e09bc7..960cad507ea 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ChannelExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ChannelExecution.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
+package org.apache.texera.amber.engine.architecture.controller.execution
 
 case class ChannelExecution()
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ExecutionUtils.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ExecutionUtils.scala
index 25694706843..7ee9bc04735 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ExecutionUtils.scala
@@ -17,14 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
+package org.apache.texera.amber.engine.architecture.controller.execution
 
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.worker.statistics.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.worker.statistics.{
   PortTupleMetricsMapping,
   TupleMetrics
 }
-import edu.uci.ics.amber.engine.common.executionruntimestate.{OperatorMetrics, OperatorStatistics}
+import org.apache.texera.amber.engine.common.executionruntimestate.{
+  OperatorMetrics,
+  OperatorStatistics
+}
 
 object ExecutionUtils {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/LinkExecution.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/LinkExecution.scala
index 38e90b43c71..434636e16f6 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/LinkExecution.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
+package org.apache.texera.amber.engine.architecture.controller.execution
 
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/OperatorExecution.scala
similarity index 85%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/OperatorExecution.scala
index cf32c5c7121..5a7f57083a4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/OperatorExecution.scala
@@ -17,18 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
+package org.apache.texera.amber.engine.architecture.controller.execution
 
-import edu.uci.ics.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateStates
-import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.WorkerExecution
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.worker.statistics.{
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateStates
+import org.apache.texera.amber.engine.architecture.deploysemantics.layer.WorkerExecution
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.worker.statistics.{
   PortTupleMetricsMapping,
   WorkerState
 }
-import edu.uci.ics.amber.engine.common.executionruntimestate.{OperatorMetrics, OperatorStatistics}
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.common.executionruntimestate.{
+  OperatorMetrics,
+  OperatorStatistics
+}
 
 import java.util
 import scala.jdk.CollectionConverters._
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/RegionExecution.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/RegionExecution.scala
index e78bac29567..d5939c2e3b1 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/RegionExecution.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
+package org.apache.texera.amber.engine.architecture.controller.execution
 
 import com.rits.cloning.Cloner
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.scheduling.Region
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerStatistics
-import edu.uci.ics.amber.engine.common.executionruntimestate.OperatorMetrics
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
-import edu.uci.ics.amber.core.workflow.PhysicalLink
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.core.workflow.PhysicalLink
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.scheduling.Region
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerStatistics
+import org.apache.texera.amber.engine.common.executionruntimestate.OperatorMetrics
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkerPortExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkerPortExecution.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkerPortExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkerPortExecution.scala
index 0796c425d8d..0b7c3a39397 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkerPortExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkerPortExecution.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
+package org.apache.texera.amber.engine.architecture.controller.execution
 
 case class WorkerPortExecution() {
   var completed: Boolean = false
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkflowExecution.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkflowExecution.scala
index b36e8b27b4b..dea9b692a4f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkflowExecution.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.execution
-
-import edu.uci.ics.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateMetrics
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
-import edu.uci.ics.amber.engine.architecture.scheduling.{Region, RegionIdentity}
-import edu.uci.ics.amber.engine.common.executionruntimestate.OperatorMetrics
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
+package org.apache.texera.amber.engine.architecture.controller.execution
+
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateMetrics
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
+import org.apache.texera.amber.engine.architecture.scheduling.{Region, RegionIdentity}
+import org.apache.texera.amber.engine.common.executionruntimestate.OperatorMetrics
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala
similarity index 78%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala
index 091c9d98413..4030ad7d3ee 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   ConsoleMessageTriggeredRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
 
 trait ConsoleMessageHandler {
   this: ControllerAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala
index c6955f7c928..2e18ec6ba14 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   DebugCommandRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
 
 trait DebugCommandHandler {
   this: ControllerAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala
index a91bd14c5b8..45a4491ad95 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   ControlInvocation,
   PropagateEmbeddedControlMessageRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
   ControlReturn,
   PropagateEmbeddedControlMessageResponse
 }
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 trait EmbeddedControlMessageHandler {
   this: ControllerAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala
index 872fbb0f378..6a235b2e77f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   EvaluatePythonExpressionRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EvaluatePythonExpressionResponse
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EvaluatePythonExpressionResponse
 
 trait EvaluatePythonExpressionHandler {
   this: ControllerAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala
index 5f4d4c63bb8..f8a967aad73 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AddInputChannelRequest,
   AddPartitioningRequest,
   AsyncRPCContext,
   LinkWorkersRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
 
 /** add a data transfer partitioning to the sender workers and update input linking
   * for the receiver workers of a link strategy.
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala
index 3f543a6f632..5511fea6abb 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala
@@ -17,18 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerAsyncRPCHandlerInitializer,
   ExecutionStateUpdate,
   ExecutionStatsUpdate
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, WorkerMetricsResponse}
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
+  EmptyReturn,
+  WorkerMetricsResponse
+}
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala
index cdd14df42b0..0add56eba3f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala
@@ -17,23 +17,23 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.core.workflow.GlobalPortIdentity
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.workflow.GlobalPortIdentity
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerAsyncRPCHandlerInitializer,
   FatalError
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   PortCompletedRequest,
   QueryStatisticsRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 /** Notify the completion of a port:
   * - For input port, it means the worker has finished consuming and processing all the data
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala
index 6cbf90821c8..fb725f850e5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala
@@ -17,23 +17,26 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerAsyncRPCHandlerInitializer,
   ExecutionStatsUpdate
 }
-import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.WorkerExecution
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.deploysemantics.layer.WorkerExecution
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   EmptyRequest,
   QueryStatisticsRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, WorkerMetricsResponse}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
+  EmptyReturn,
+  WorkerMetricsResponse
+}
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 /** Get statistics from all the workers
   *
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala
index fedd6a6a1e8..020ad40a1c9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala
@@ -17,16 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerAsyncRPCHandlerInitializer,
   ExecutionStatsUpdate
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 /** resume the entire workflow
   *
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala
similarity index 75%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala
index b783b1c749a..b6e75cd823b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala
@@ -17,23 +17,23 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   EmptyRequest,
   PropagateEmbeddedControlMessageRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
   RetrieveWorkflowStateResponse,
   StringResponse
 }
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_RETRIEVE_STATE
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
-import edu.uci.ics.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_RETRIEVE_STATE
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
 
 import java.time.Instant
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala
index d3e71f5a435..a2e1e257f8a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   EmptyRequest,
   RetryWorkflowRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
 
 /** retry the execution of the entire workflow
   *
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala
similarity index 76%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala
index 63d038e8c95..2ce28afb0f0 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala
@@ -17,13 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.StartWorkflowResponse
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.StartWorkflowResponse
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING
 
 /** start the workflow by starting the source workers
   * note that this SHOULD only be called once per workflow
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala
index cac92760559..128c00fc562 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.TakeGlobalCheckpointResponse
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_PREPARE_CHECKPOINT
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
-import edu.uci.ics.amber.engine.common.{CheckpointState, SerializedState}
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.TakeGlobalCheckpointResponse
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_PREPARE_CHECKPOINT
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
+import org.apache.texera.amber.engine.common.{CheckpointState, SerializedState}
 
 import java.net.URI
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala
index 9d87d32205c..594673caa53 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerAsyncRPCHandlerInitializer,
   ExecutionStateUpdate
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   EmptyRequest,
   QueryStatisticsRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
 
 /** indicate a worker has completed its execution
   * i.e. received and processed all data from upstreams
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala
index 037b7e3b093..c1fa6b1ef7a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller.promisehandlers
+package org.apache.texera.amber.engine.architecture.controller.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerAsyncRPCHandlerInitializer,
   ExecutionStatsUpdate
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   WorkerStateUpdatedRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 /** indicate the state change of a worker
   *
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/AddressInfo.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/AddressInfo.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/AddressInfo.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/AddressInfo.scala
index 8ead36f5d28..f23e54d736d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/AddressInfo.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/AddressInfo.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.deploysemantics
+package org.apache.texera.amber.engine.architecture.deploysemantics
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 // Holds worker and controller node addresses.
 case class AddressInfo(
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala
index 183e46b7185..079d253c848 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.deploysemantics.deploystrategy
+package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 trait DeployStrategy extends Serializable {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala
index 0edc28f5bd8..62cf288263b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.deploysemantics.deploystrategy
+package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 object OneOnEach {
   def apply() = new OneOnEach()
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala
index 1eeb3497682..aebab32fca9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.deploysemantics.deploystrategy
+package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 object RandomDeployment {
   def apply() = new RandomDeployment()
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala
index 12d3d0d447e..3fee912d7d9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.deploysemantics.deploystrategy
+package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 object RoundRobinDeployment {
   def apply() = new RoundRobinDeployment()
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala
index fd524e5f3ee..55e1e309181 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.deploysemantics.layer
+package org.apache.texera.amber.engine.architecture.deploysemantics.layer
 
-import edu.uci.ics.amber.engine.architecture.controller.execution.WorkerPortExecution
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.UNINITIALIZED
-import edu.uci.ics.amber.engine.architecture.worker.statistics.{WorkerState, WorkerStatistics}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.controller.execution.WorkerPortExecution
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.UNINITIALIZED
+import org.apache.texera.amber.engine.architecture.worker.statistics.{WorkerState, WorkerStatistics}
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala
index 47fa87d4c4e..39969340d39 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
 import com.google.common.collect.Queues
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter
 
 import java.util
 import java.util.concurrent.CompletableFuture
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/EmptyReplayLogger.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/EmptyReplayLogger.scala
index b7d50aaf11a..74be96acdbd 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/EmptyReplayLogger.scala
@@ -17,10 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity}
+import org.apache.texera.amber.core.virtualidentity.{
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
+}
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
 
 class EmptyReplayLogger extends ReplayLogger {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/OrderEnforcer.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/OrderEnforcer.scala
index 7538912ab24..b18151992fd 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/OrderEnforcer.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
 
 trait OrderEnforcer {
   var isCompleted: Boolean
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogGenerator.scala
similarity index 85%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogGenerator.scala
index 5933041719c..d159263db33 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogGenerator.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogManager.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogManager.scala
index c7b1e8347c6..a894ab3c8ef 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogManager.scala
@@ -17,14 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
-
-import edu.uci.ics.amber.engine.architecture.common.ProcessingStepCursor
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter
-import edu.uci.ics.amber.engine.common.storage.{EmptyRecordStorage, SequentialRecordStorage}
-import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity}
+package org.apache.texera.amber.engine.architecture.logreplay
+
+import org.apache.texera.amber.core.virtualidentity.{
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
+}
+import org.apache.texera.amber.engine.architecture.common.ProcessingStepCursor
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter
+import org.apache.texera.amber.engine.common.storage.{EmptyRecordStorage, SequentialRecordStorage}
 
 //In-mem formats:
 sealed trait ReplayLogRecord extends Serializable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogger.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogger.scala
index f1d2680f432..9fbd8bf1a0b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogger.scala
@@ -17,10 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity}
+import org.apache.texera.amber.core.virtualidentity.{
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
+}
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
 
 abstract class ReplayLogger {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala
index 12b90b0888d..42f5b9e2069 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala
@@ -17,11 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
-import edu.uci.ics.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity}
+import org.apache.texera.amber.core.virtualidentity.{
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
+}
+import org.apache.texera.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala
index c80da750bd1..6441aae2c20 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.logreplay
+package org.apache.texera.amber.engine.architecture.logreplay
 
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala
index 733d861f668..d81b4239ba7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
 
 import java.util.concurrent.atomic.AtomicLong
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/CongestionControl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/CongestionControl.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/CongestionControl.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/CongestionControl.scala
index 5fe0706f170..337be75cf19 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/CongestionControl.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/CongestionControl.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkMessage
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala
index aa3fbcb05ac..323761fca11 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import akka.actor.{Actor, DeadLetter}
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.{
+import org.apache.pekko.actor.{Actor, DeadLetter}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{
   MessageBecomesDeadLetter,
   NetworkMessage
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/FlowControl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/FlowControl.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala
index f0786a396bd..d4b24dad1d8 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/FlowControl.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
 
 import scala.collection.mutable
 import scala.util.control.Breaks.{break, breakable}
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputGateway.scala
similarity index 85%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputGateway.scala
index 52e994f86c7..8d0c313f806 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputGateway.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.engine.architecture.logreplay.OrderEnforcer
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.engine.architecture.logreplay.OrderEnforcer
 
 trait InputGateway {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputManager.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputManager.scala
index 11328b0e2a0..4e297829431 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputManager.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
-
-import edu.uci.ics.amber.core.tuple.{Schema, Tuple}
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.Partitioning
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement
-import edu.uci.ics.amber.engine.architecture.worker.managers.InputPortMaterializationReaderThread
-import edu.uci.ics.amber.engine.common.AmberLogging
+package org.apache.texera.amber.engine.architecture.messaginglayer
+
+import org.apache.texera.amber.core.tuple.{Schema, Tuple}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement
+import org.apache.texera.amber.engine.architecture.worker.managers.InputPortMaterializationReaderThread
+import org.apache.texera.amber.engine.common.AmberLogging
 
 import java.net.URI
 import java.util.concurrent.LinkedBlockingQueue
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala
index fad906ccaf8..5cfd8aabc04 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.engine.architecture.logreplay.OrderEnforcer
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.logreplay.OrderEnforcer
+import org.apache.texera.amber.engine.common.AmberLogging
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala
index 844429de741..929a30f4efa 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.ambermessage.{
-  DirectControlMessagePayload,
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.ambermessage.{
   DataPayload,
+  DirectControlMessagePayload,
   WorkflowFIFOMessage,
   WorkflowFIFOMessagePayload
 }
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
 
 import java.util.concurrent.atomic.AtomicLong
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala
index 4806e826501..d840738a45d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManager.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManager.scala
index 023c6b5738f..4ab3d18056f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManager.scala
@@ -17,27 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
-
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.storage.model.BufferedItemWriter
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity}
-import edu.uci.ics.amber.engine.architecture.messaginglayer.OutputManager.{
+package org.apache.texera.amber.engine.architecture.messaginglayer
+
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.model.BufferedItemWriter
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.engine.architecture.messaginglayer.OutputManager.{
   DPOutputIterator,
   getBatchSize,
   toPartitioner
 }
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners._
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings._
-import edu.uci.ics.amber.engine.architecture.worker.managers.{
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitioners._
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings._
+import org.apache.texera.amber.engine.architecture.worker.managers.{
   OutputPortResultWriterThread,
   PortStorageWriterTerminateSignal
 }
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.util.VirtualIdentityUtils
+
 import java.net.URI
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerPort.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerPort.scala
index 7db58d7e7ac..504aaf93704 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerPort.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
 
 import scala.collection.mutable
 case class WorkerPort(
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerTimerService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala
similarity index 75%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerTimerService.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala
index f21f61c5ad9..3bb87febd93 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerTimerService.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala
@@ -17,16 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import akka.actor.Cancellable
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.engine.architecture.common.AkkaActorService
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_FLUSH_NETWORK_BUFFER
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
+import org.apache.pekko.actor.Cancellable
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.engine.architecture.common.AkkaActorService
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_FLUSH_NETWORK_BUFFER
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
 
 import scala.concurrent.duration.{DurationInt, FiniteDuration, MILLISECONDS}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyClient.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyClient.scala
index cafc7984a0b..6618e857b1d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyClient.scala
@@ -17,37 +17,36 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.pythonworker
+package org.apache.texera.amber.engine.architecture.pythonworker
 
 import com.twitter.util.{Await, Promise}
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.core.tuple.{Schema, Tuple}
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.tuple.{Schema, Tuple}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{
   ActorCommandElement,
-  EmbeddedControlMessageElement,
   ControlElement,
-  DataElement
+  DataElement,
+  EmbeddedControlMessageElement
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
-  EmbeddedControlMessage,
-  ControlInvocation
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  ControlInvocation,
+  EmbeddedControlMessage
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.ReturnInvocation
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.actormessage.{ActorCommand, PythonActorMessage}
-import edu.uci.ics.amber.engine.common.ambermessage._
-import edu.uci.ics.amber.util.ArrowUtils
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.ReturnInvocation
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.actormessage.{ActorCommand, PythonActorMessage}
+import org.apache.texera.amber.engine.common.ambermessage._
+import org.apache.texera.amber.util.ArrowUtils
 import org.apache.arrow.flight._
 import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator}
+import org.apache.arrow.vector.types.pojo.{ArrowType, Field, FieldType, Schema => ArrowSchema}
 import org.apache.arrow.vector.{VarBinaryVector, VectorSchemaRoot}
-import org.apache.arrow.vector.types.pojo.{ArrowType, Field, FieldType}
 
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicLong
 import scala.collection.compat.immutable.ArraySeq
 import scala.collection.mutable
-import org.apache.arrow.vector.types.pojo.{Schema => ArrowSchema}
 import scala.jdk.CollectionConverters._
 
 class PythonProxyClient(portNumberPromise: Promise[Int], val actorId: ActorVirtualIdentity)
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyServer.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyServer.scala
index 51ac8ce0376..c904e436bcd 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyServer.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.pythonworker
+package org.apache.texera.amber.engine.architecture.pythonworker
 
 import com.google.common.primitives.Longs
 import com.twitter.util.Promise
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkOutputGateway
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.ambermessage.DirectControlMessagePayloadV2.Value.{
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.ambermessage.DirectControlMessagePayloadV2.Value.{
   ControlInvocation => ControlInvocationV2,
   ReturnInvocation => ReturnInvocationV2
 }
-import edu.uci.ics.amber.engine.common.ambermessage._
-import edu.uci.ics.amber.util.ArrowUtils
+import org.apache.texera.amber.engine.common.ambermessage._
+import org.apache.texera.amber.util.ArrowUtils
 import org.apache.arrow.flight._
 import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator}
 import org.apache.arrow.util.AutoCloseables
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala
index ee3b58ccb1e..558b99c9b7b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala
@@ -17,28 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.pythonworker
+package org.apache.texera.amber.engine.architecture.pythonworker
 
-import akka.actor.Props
+import org.apache.pekko.actor.Props
 import com.twitter.util.Promise
-import edu.uci.ics.amber.config.{StorageConfig, UdfConfig}
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkAck
-import edu.uci.ics.amber.engine.architecture.messaginglayer.{
+import org.apache.texera.amber.config.{StorageConfig, UdfConfig}
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck
+import org.apache.texera.amber.engine.architecture.messaginglayer.{
   NetworkInputGateway,
   NetworkOutputGateway
 }
-import edu.uci.ics.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{
-  EmbeddedControlMessageElement,
-  DataElement
+import org.apache.texera.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{
+  DataElement,
+  EmbeddedControlMessageElement
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
-import edu.uci.ics.amber.engine.architecture.scheduling.config.WorkerConfig
-import edu.uci.ics.amber.engine.common.actormessage.{Backpressure, CreditUpdate}
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.engine.common.ambermessage._
-import edu.uci.ics.amber.engine.common.{CheckpointState, Utils}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
+import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig
+import org.apache.texera.amber.engine.common.actormessage.{Backpressure, CreditUpdate}
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.engine.common.ambermessage._
+import org.apache.texera.amber.engine.common.{CheckpointState, Utils}
 
 import java.nio.file.Path
 import java.util.concurrent.{ExecutorService, Executors}
@@ -183,7 +183,11 @@ class PythonWorkflowWorker(
         StorageConfig.icebergPostgresCatalogPassword,
         StorageConfig.icebergTableResultNamespace,
         StorageConfig.fileStorageDirectoryPath.toString,
-        StorageConfig.icebergTableCommitBatchSize.toString
+        StorageConfig.icebergTableCommitBatchSize.toString,
+        StorageConfig.s3Endpoint,
+        StorageConfig.s3Region,
+        StorageConfig.s3Username,
+        StorageConfig.s3Password
       )
     ).run(BasicIO.standard(false))
   }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala
index 9e036ba9c22..11f9b6b802b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.pythonworker
+package org.apache.texera.amber.engine.architecture.pythonworker
 
-import edu.uci.ics.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue._
-import edu.uci.ics.amber.engine.common.actormessage.ActorCommand
-import edu.uci.ics.amber.engine.common.ambermessage.{
-  DirectControlMessagePayload,
+import lbmq.LinkedBlockingMultiQueue
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
+import org.apache.texera.amber.engine.common.actormessage.ActorCommand
+import org.apache.texera.amber.engine.common.ambermessage.{
   DataFrame,
-  DataPayload
+  DataPayload,
+  DirectControlMessagePayload
 }
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
-import lbmq.LinkedBlockingMultiQueue
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala
similarity index 97%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala
index 324de1c7f01..0b68aad221e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala
@@ -17,32 +17,25 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
-
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.storage.VFSURIFactory.createResultURI
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity}
-import edu.uci.ics.amber.core.workflow.{
-  GlobalPortIdentity,
-  PhysicalLink,
-  PhysicalOp,
-  PhysicalPlan,
-  WorkflowContext
-}
-import edu.uci.ics.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex
-import edu.uci.ics.amber.engine.architecture.scheduling.config.{
+package org.apache.texera.amber.engine.architecture.scheduling
+
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.storage.VFSURIFactory.createResultURI
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex
+import org.apache.texera.amber.engine.architecture.scheduling.config.{
   IntermediateInputPortConfig,
   OutputPortConfig,
   ResourceConfig
 }
-import edu.uci.ics.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.AmberLogging
 import org.jgrapht.Graph
 import org.jgrapht.alg.connectivity.BiconnectivityInspector
 import org.jgrapht.graph.{DirectedAcyclicGraph, DirectedPseudograph}
 
 import java.net.URI
 import java.util.concurrent.TimeoutException
-import scala.collection.immutable.HashMap
 import scala.collection.mutable
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration.DurationInt
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostEstimator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostEstimator.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostEstimator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostEstimator.scala
index 78964f57bb8..d86101a1f06 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostEstimator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostEstimator.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.architecture.scheduling.DefaultCostEstimator.DEFAULT_OPERATOR_COST
-import edu.uci.ics.amber.engine.architecture.scheduling.config.ResourceConfig
-import edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies.ResourceAllocator
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.dao.jooq.generated.Tables.{WORKFLOW_EXECUTIONS, WORKFLOW_VERSION}
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.engine.architecture.scheduling.DefaultCostEstimator.DEFAULT_OPERATOR_COST
+import org.apache.texera.amber.engine.architecture.scheduling.config.ResourceConfig
+import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.ResourceAllocator
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.Tables.{WORKFLOW_EXECUTIONS, WORKFLOW_VERSION}
 
 import java.net.URI
 import scala.util.{Failure, Success, Try}
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala
similarity index 97%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala
index 8cbc7075bf0..4bb89338967 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.core.storage.VFSURIFactory.createResultURI
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
-import edu.uci.ics.amber.core.workflow.{
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.storage.VFSURIFactory.createResultURI
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.core.workflow.{
   GlobalPortIdentity,
   PhysicalLink,
   PhysicalPlan,
   WorkflowContext
 }
-import SchedulingUtils.replaceVertex
-import edu.uci.ics.amber.engine.architecture.scheduling.config.{
+import org.apache.texera.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex
+import org.apache.texera.amber.engine.architecture.scheduling.config.{
   IntermediateInputPortConfig,
   OutputPortConfig,
   ResourceConfig
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Region.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Region.scala
index fc3b73029a2..248a3ece3c1 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Region.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp}
-import edu.uci.ics.amber.engine.architecture.scheduling.config.ResourceConfig
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp}
+import org.apache.texera.amber.engine.architecture.scheduling.config.ResourceConfig
 import org.jgrapht.graph.{DefaultEdge, DirectedAcyclicGraph}
 import org.jgrapht.traverse.TopologicalOrderIterator
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala
index 58e763d3322..7e5b228801f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala
@@ -17,44 +17,46 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
-import akka.pattern.gracefulStop
+import org.apache.pekko.pattern.gracefulStop
 import com.twitter.util.{Future, Return, Throw}
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.storage.VFSURIFactory.decodeURI
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp}
-import edu.uci.ics.amber.engine.architecture.common.{
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.VFSURIFactory.decodeURI
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp}
+import org.apache.texera.amber.engine.architecture.common.{
   AkkaActorRefMappingService,
   AkkaActorService,
   ExecutorDeployment
 }
-import edu.uci.ics.amber.engine.architecture.controller.execution.{
+import org.apache.texera.amber.engine.architecture.controller.execution.{
   OperatorExecution,
   RegionExecution,
   WorkflowExecution
 }
-import edu.uci.ics.amber.engine.architecture.controller.{
+import org.apache.texera.amber.engine.architecture.controller.{
   ControllerConfig,
   ExecutionStatsUpdate,
   WorkerAssignmentUpdate
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.scheduling.config.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.scheduling.config.{
   InputPortConfig,
   OperatorConfig,
   OutputPortConfig,
   ResourceConfig
 }
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.Partitioning
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.FutureBijection._
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.FutureBijection._
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.web.SessionState
+import org.apache.texera.web.model.websocket.event.RegionStateEvent
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
 
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
@@ -116,7 +118,7 @@ class RegionExecutionCoordinator(
     * 1.  An `EndWorker` control message is first sent to all the workers. This will be the last message each worker
     * receives. We wait for all workers have replied to indicate they have finished processing all control messages.
     *
-    * 2. Only after all workers have processed all control messages do we send a `gracefulStop` (akka message) to each
+    * 2. Only after all workers have processed all control messages do we send a `gracefulStop` (pekko message) to each
     * worker. JVM workers will be terminated by `gracefulStop`. Python proxy workes will also be terminated by
     * `gracefulStop`, whose termination logic will also kill the PVMs.
     */
@@ -134,7 +136,7 @@ class RegionExecutionCoordinator(
 
     // Set this coordinator's status to be completed so that subsequent regions can be started by
     // WorkflowExecutionCoordinator.
-    currentPhaseRef.set(Completed)
+    setPhase(Completed)
 
     // Terminate all the workers in this region.
     terminateWorkers(regionExecution)
@@ -223,7 +225,7 @@ class RegionExecutionCoordinator(
     }
 
   private def executeDependeePortPhase(): Future[Unit] = {
-    currentPhaseRef.set(ExecutingDependeePortsPhase)
+    setPhase(ExecutingDependeePortsPhase)
     if (!region.getOperators.exists(_.dependeeInputs.nonEmpty)) {
       // Skip to the next phase when there are no dependee input ports
       return syncStatusAndTransitionRegionExecutionPhase()
@@ -239,7 +241,7 @@ class RegionExecutionCoordinator(
   }
 
   private def executeNonDependeePortPhase(): Future[Unit] = {
-    currentPhaseRef.set(ExecutingNonDependeePortsPhase)
+    setPhase(ExecutingNonDependeePortsPhase)
     // Allocate output port storage objects
     region.resourceConfig.get.portConfigs
       .collect {
@@ -541,5 +543,12 @@ class RegionExecutionCoordinator(
     }
   }
 
+  private def setPhase(phase: RegionExecutionPhase): Unit = {
+    currentPhaseRef.set(phase)
+    SessionState.getAllSessionStates.foreach { state =>
+      state.send(RegionStateEvent(region.id.id, phase.toString))
+    }
+  }
+
   override def actorId: ActorVirtualIdentity = CONTROLLER
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionPlan.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionPlan.scala
index f33c6162cdb..95937517de2 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionPlan.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PhysicalLink}
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink}
 import org.jgrapht.graph.DirectedAcyclicGraph
 import org.jgrapht.traverse.TopologicalOrderIterator
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Schedule.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Schedule.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Schedule.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Schedule.scala
index c3ecbc1ae79..6f34c9ed1e5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Schedule.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Schedule.scala
@@ -17,11 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
 case class Schedule(private val levelSets: Map[Int, Set[Region]]) extends Iterator[Set[Region]] {
   private var currentLevel = levelSets.keys.minOption.getOrElse(0)
 
+  def getRegions: List[Region] = levelSets.values.flatten.toList
+
   override def hasNext: Boolean = levelSets.isDefinedAt(currentLevel)
 
   override def next(): Set[Region] = {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala
index b222972f3bf..0fe8ffc9639 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies.{
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.{
   DefaultResourceAllocator,
   ExecutionClusterInfo
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/SchedulingUtils.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/SchedulingUtils.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/SchedulingUtils.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/SchedulingUtils.scala
index 46ba8580b14..72cd2158627 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/SchedulingUtils.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/SchedulingUtils.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
 import org.jgrapht.graph.DirectedAcyclicGraph
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala
index 7a32e55704d..05585f88d8d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala
@@ -17,15 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
+package org.apache.texera.amber.engine.architecture.scheduling
 
 import com.twitter.util.Future
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.engine.architecture.common.{AkkaActorRefMappingService, AkkaActorService}
-import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig
-import edu.uci.ics.amber.engine.architecture.controller.execution.WorkflowExecution
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PhysicalLink}
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink}
+import org.apache.texera.amber.engine.architecture.common.{
+  AkkaActorRefMappingService,
+  AkkaActorService
+}
+import org.apache.texera.amber.engine.architecture.controller.ControllerConfig
+import org.apache.texera.amber.engine.architecture.controller.execution.WorkflowExecution
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ChannelConfig.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ChannelConfig.scala
index 43a50662aa0..83d4ed985a3 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ChannelConfig.scala
@@ -17,19 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.config
+package org.apache.texera.amber.engine.architecture.scheduling.config
 
-import edu.uci.ics.amber.core.workflow.{
-  BroadcastPartition,
-  HashPartition,
-  OneToOnePartition,
-  PartitionInfo,
-  RangePartition,
-  SinglePartition,
-  UnknownPartition
-}
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow._
 
 case object ChannelConfig {
   def generateChannelConfigs(
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/LinkConfig.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/LinkConfig.scala
index 76430309ad9..ef0117834cc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/LinkConfig.scala
@@ -17,19 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.config
+package org.apache.texera.amber.engine.architecture.scheduling.config
 
-import edu.uci.ics.amber.core.workflow.{
-  BroadcastPartition,
-  HashPartition,
-  OneToOnePartition,
-  PartitionInfo,
-  RangePartition,
-  SinglePartition,
-  UnknownPartition
-}
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings._
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings._
 
 case object LinkConfig {
   def toPartitioning(
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/OperatorConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/OperatorConfig.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/OperatorConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/OperatorConfig.scala
index c96d005b93b..883a09e4bf0 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/OperatorConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/OperatorConfig.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.config
+package org.apache.texera.amber.engine.architecture.scheduling.config
 
 case object OperatorConfig {
   def empty: OperatorConfig = {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/PortConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/PortConfig.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/PortConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/PortConfig.scala
index 37c92cd78f3..b4a1e058b44 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/PortConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/PortConfig.scala
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.config
+package org.apache.texera.amber.engine.architecture.scheduling.config
+
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning
 
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.Partitioning
 import java.net.URI
 
 /**
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ResourceConfig.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ResourceConfig.scala
index 612aad84949..b89ff9a5a91 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ResourceConfig.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.config
+package org.apache.texera.amber.engine.architecture.scheduling.config
 
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PhysicalLink}
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink}
 
 case class ResourceConfig(
     operatorConfigs: Map[PhysicalOpIdentity, OperatorConfig] = Map.empty,
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala
index 14c89197967..60a55151850 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.config
+package org.apache.texera.amber.engine.architecture.scheduling.config
 
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.PhysicalOp
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 case object WorkerConfig {
   def generateWorkerConfigs(physicalOp: PhysicalOp): List[WorkerConfig] = {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala
index aea819a0a81..c99121b735e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies
+package org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies
 
 class ExecutionClusterInfo() {}
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala
index 39f3f5b9aca..2953ece0b34 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies
-
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.engine.architecture.scheduling.Region
-import edu.uci.ics.amber.engine.architecture.scheduling.config.ChannelConfig.generateChannelConfigs
-import edu.uci.ics.amber.engine.architecture.scheduling.config.LinkConfig.toPartitioning
-import edu.uci.ics.amber.engine.architecture.scheduling.config.WorkerConfig.generateWorkerConfigs
-import edu.uci.ics.amber.engine.architecture.scheduling.config._
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.Partitioning
-import edu.uci.ics.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage
+package org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies
+
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.engine.architecture.scheduling.Region
+import org.apache.texera.amber.engine.architecture.scheduling.config.ChannelConfig.generateChannelConfigs
+import org.apache.texera.amber.engine.architecture.scheduling.config.LinkConfig.toPartitioning
+import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig.generateWorkerConfigs
+import org.apache.texera.amber.engine.architecture.scheduling.config._
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning
+import org.apache.texera.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage
 
 import java.net.URI
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala
index d4ae36a10b2..71de92ced60 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners
+package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.BroadcastPartitioning
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.BroadcastPartitioning
 
 case class BroadcastPartitioner(partitioning: BroadcastPartitioning) extends Partitioner {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala
index 0d9805c47bb..7025a4bd2cf 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners
+package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.HashBasedShufflePartitioning
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.HashBasedShufflePartitioning
 
 case class HashBasedShufflePartitioner(partitioning: HashBasedShufflePartitioning)
     extends Partitioner {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala
index 489b2ecfdf5..f1360f8be4a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners
+package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
 
 case class OneToOnePartitioner(partitioning: OneToOnePartitioning, actorId: ActorVirtualIdentity)
     extends Partitioner {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala
similarity index 77%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala
index dddd0da1635..eac77bce365 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala
@@ -17,14 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners
+package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners
+
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway
+import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, StateFrame}
 
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkOutputGateway
-import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, StateFrame}
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
 import scala.collection.mutable.ArrayBuffer
 
 trait Partitioner extends Serializable {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala
index b3334049bc6..9b8aae263f1 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners
+package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners
 
-import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple}
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.tuple.{AttributeType, Tuple}
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning
 
 case class RangeBasedShufflePartitioner(partitioning: RangeBasedShufflePartitioning)
     extends Partitioner {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala
similarity index 80%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala
index 04fe2605283..185f2e5e3ac 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners
+package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RoundRobinPartitioning
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.RoundRobinPartitioning
 
 case class RoundRobinPartitioner(partitioning: RoundRobinPartitioning) extends Partitioner {
   private var roundRobinIndex = 0
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DPThread.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DPThread.scala
index 1d91ab5df42..0c136d613a5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DPThread.scala
@@ -17,25 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import edu.uci.ics.amber.engine.architecture.logreplay.ReplayLogManager
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.logreplay.ReplayLogManager
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   DPInputQueueElement,
   MainThreadDelegateMessage
 }
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{READY, UNINITIALIZED}
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.actormessage.{ActorCommand, Backpressure}
-import edu.uci.ics.amber.engine.common.ambermessage.{
-  DirectControlMessagePayload,
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{
+  READY,
+  UNINITIALIZED
+}
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.actormessage.{ActorCommand, Backpressure}
+import org.apache.texera.amber.engine.common.ambermessage.{
   DataPayload,
+  DirectControlMessagePayload,
   WorkflowFIFOMessage
 }
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
-import edu.uci.ics.amber.error.ErrorUtils.safely
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
+import org.apache.texera.amber.error.ErrorUtils.safely
 
 import java.util.concurrent._
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessor.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessor.scala
index d36fd8b1a1e..3aa5fa90a46 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessor.scala
@@ -17,54 +17,48 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
 import com.softwaremill.macwire.wire
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.tuple.{
-  FinalizeExecutor,
-  FinalizePort,
-  SchemaEnforceable,
-  Tuple,
-  TupleLike
+import io.grpc.MethodDescriptor
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.virtualidentity.{
+  ActorVirtualIdentity,
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
 }
-import edu.uci.ics.amber.engine.architecture.common.AmberProcessor
-import edu.uci.ics.amber.engine.architecture.logreplay.ReplayLogManager
-import edu.uci.ics.amber.engine.architecture.messaginglayer.{
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.common.AmberProcessor
+import org.apache.texera.amber.engine.architecture.logreplay.ReplayLogManager
+import org.apache.texera.amber.engine.architecture.messaginglayer.{
   InputManager,
   OutputManager,
   WorkerTimerService
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{
   NO_ALIGNMENT,
   PORT_ALIGNMENT
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_END_CHANNEL
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   DPInputQueueElement,
   MainThreadDelegateMessage
 }
-import edu.uci.ics.amber.engine.architecture.worker.managers.SerializationManager
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{
+import org.apache.texera.amber.engine.architecture.worker.managers.SerializationManager
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{
   COMPLETED,
   READY,
   RUNNING
 }
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerStatistics
-import edu.uci.ics.amber.engine.common.ambermessage._
-import edu.uci.ics.amber.engine.common.statetransition.WorkerStateManager
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.error.ErrorUtils.{mkConsoleMessage, safely}
-import edu.uci.ics.amber.core.virtualidentity.{
-  ActorVirtualIdentity,
-  ChannelIdentity,
-  EmbeddedControlMessageIdentity
-}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_END_CHANNEL
-import io.grpc.MethodDescriptor
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerStatistics
+import org.apache.texera.amber.engine.common.ambermessage._
+import org.apache.texera.amber.engine.common.statetransition.WorkerStateManager
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.error.ErrorUtils.{mkConsoleMessage, safely}
 
 import java.util.concurrent.LinkedBlockingQueue
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala
similarity index 78%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala
index bf5363e6e61..2abcdf66975 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   DebugCommandRequest,
   EmptyRequest,
   EvaluatePythonExpressionRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, EvaluatedValue}
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc
-import edu.uci.ics.amber.engine.architecture.worker.promisehandlers._
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCHandlerInitializer
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, EvaluatedValue}
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc
+import org.apache.texera.amber.engine.architecture.worker.promisehandlers._
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCHandlerInitializer
 
 class DataProcessorRPCHandlerInitializer(val dp: DataProcessor)
     extends AsyncRPCHandlerInitializer(dp.asyncRPCClient, dp.asyncRPCServer)
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala
index 55d3cbc37fd..2837c11d80d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import edu.uci.ics.amber.engine.architecture.messaginglayer.{InputGateway, InputManager}
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{
-  NO_ALIGNMENT,
-  PORT_ALIGNMENT,
-  ALL_ALIGNMENT
-}
-import edu.uci.ics.amber.engine.common.{AmberLogging, CheckpointState}
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   ChannelIdentity,
   EmbeddedControlMessageIdentity
 }
+import org.apache.texera.amber.engine.architecture.messaginglayer.{InputGateway, InputManager}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{
+  ALL_ALIGNMENT,
+  NO_ALIGNMENT,
+  PORT_ALIGNMENT
+}
+import org.apache.texera.amber.engine.common.{AmberLogging, CheckpointState}
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseManager.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseManager.scala
index 0f3066c2697..80cf9c1415d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseManager.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import edu.uci.ics.amber.engine.architecture.messaginglayer.InputGateway
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.messaginglayer.InputGateway
+import org.apache.texera.amber.engine.common.AmberLogging
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseType.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseType.scala
index 70cac2e9dcc..30671b094c5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseType.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import edu.uci.ics.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity
 
 sealed trait PauseType
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/WorkflowWorker.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/WorkflowWorker.scala
index 0f24e51f8d3..d1a0a300d93 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/WorkflowWorker.scala
@@ -17,21 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
-
-import akka.actor.Props
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkAck
-import edu.uci.ics.amber.engine.architecture.controller.ReplayStatusUpdate
-import edu.uci.ics.amber.engine.architecture.messaginglayer.WorkerTimerService
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ControlInvocation
-import edu.uci.ics.amber.engine.architecture.scheduling.config.WorkerConfig
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker._
-import edu.uci.ics.amber.engine.common.actormessage.{ActorCommand, Backpressure}
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.engine.common.{CheckpointState, SerializedState}
-import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity}
+package org.apache.texera.amber.engine.architecture.worker
+
+import org.apache.pekko.actor.Props
+import org.apache.texera.amber.core.virtualidentity.{
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
+}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck
+import org.apache.texera.amber.engine.architecture.controller.ReplayStatusUpdate
+import org.apache.texera.amber.engine.architecture.messaginglayer.WorkerTimerService
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ControlInvocation
+import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker._
+import org.apache.texera.amber.engine.common.actormessage.{ActorCommand, Backpressure}
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.engine.common.{CheckpointState, SerializedState}
 
 import java.net.URI
 import java.util.concurrent.LinkedBlockingQueue
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala
similarity index 80%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala
index 089343aae56..10fbbc44a2c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala
@@ -17,42 +17,37 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.managers
+package org.apache.texera.amber.engine.architecture.worker.managers
 
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.virtualidentity.{
+import io.grpc.MethodDescriptor
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.model.VirtualDocument
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   ChannelIdentity,
   EmbeddedControlMessageIdentity
 }
-import edu.uci.ics.amber.engine.architecture.messaginglayer.OutputManager.toPartitioner
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{
+import org.apache.texera.amber.engine.architecture.messaginglayer.OutputManager.toPartitioner
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{
   NO_ALIGNMENT,
   PORT_ALIGNMENT
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
-  AsyncRPCContext,
-  EmbeddedControlMessage,
-  EmbeddedControlMessageType,
-  ControlInvocation,
-  EmptyRequest
-}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
   METHOD_END_CHANNEL,
   METHOD_START_CHANNEL
 }
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.Partitioning
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   DPInputQueueElement,
   FIFOMessageElement
 }
-import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
-import edu.uci.ics.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage
-import io.grpc.MethodDescriptor
+import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
+import org.apache.texera.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage
+
 import java.net.URI
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong}
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala
index c65cc5dd388..28e5d2af667 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.managers
+package org.apache.texera.amber.engine.architecture.worker.managers
 
 import com.google.common.collect.Queues
-import edu.uci.ics.amber.core.storage.model.BufferedItemWriter
-import edu.uci.ics.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.storage.model.BufferedItemWriter
+import org.apache.texera.amber.core.tuple.Tuple
 
 import java.util.concurrent.LinkedBlockingQueue
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/SerializationManager.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/SerializationManager.scala
index 07080d864c8..b4afe510306 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/SerializationManager.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.managers
+package org.apache.texera.amber.engine.architecture.worker.managers
 
-import edu.uci.ics.amber.core.executor._
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.InitializeExecutorRequest
-import edu.uci.ics.amber.engine.common.{AmberLogging, CheckpointState, CheckpointSupport}
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.core.executor._
+import org.apache.texera.amber.core.tuple.TupleLike
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.InitializeExecutorRequest
+import org.apache.texera.amber.engine.common.{AmberLogging, CheckpointState, CheckpointSupport}
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 class SerializationManager(val actorId: ActorVirtualIdentity) extends AmberLogging {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/StatisticsManager.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/StatisticsManager.scala
index d79f2ad0a55..8ae0419f0a3 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/StatisticsManager.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.managers
+package org.apache.texera.amber.engine.architecture.worker.managers
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.engine.architecture.worker.statistics.{
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.worker.statistics.{
   PortTupleMetricsMapping,
   TupleMetrics,
   WorkerStatistics
 }
-import edu.uci.ics.amber.core.workflow.PortIdentity
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala
index 2720d299257..685f244aeee 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala
@@ -17,16 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AddInputChannelRequest,
   AsyncRPCContext
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{
+  PAUSED,
+  READY,
+  RUNNING
+}
 
 trait AddInputChannelHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala
index d492e0c1ee9..c2da82214bd 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala
@@ -17,16 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AddPartitioningRequest,
   AsyncRPCContext
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{
+  PAUSED,
+  READY,
+  RUNNING
+}
 
 trait AddPartitioningHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala
similarity index 77%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala
index f28735a2954..fe959733abb 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala
@@ -17,19 +17,23 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AssignPortRequest,
   AsyncRPCContext
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING}
-import edu.uci.ics.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{
+  PAUSED,
+  READY,
+  RUNNING
+}
+import org.apache.texera.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage
 
 import java.net.URI
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala
index 863dd59f5c7..7794342690b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala
@@ -17,14 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.tuple.FinalizePort
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.error.ErrorUtils.safely
+import org.apache.texera.amber.core.tuple.FinalizePort
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.error.ErrorUtils.safely
 
 trait EndChannelHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/EndHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndHandler.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/EndHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndHandler.scala
index 4bbd68e2b36..2a6a20b3d3e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/EndHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndHandler.scala
@@ -17,12 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
 
 /**
   * The EndWorker control messages is needed to ensure all the other control messages in a worker
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala
index bc8f0e4171a..96d7b4dfaff 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   FinalizeCheckpointRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.FinalizeCheckpointResponse
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
-import edu.uci.ics.amber.engine.architecture.worker.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.FinalizeCheckpointResponse
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
+import org.apache.texera.amber.engine.architecture.worker.{
   DataProcessorRPCHandlerInitializer,
   WorkflowWorker
 }
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState}
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState}
 
 import java.net.URI
 import java.util.concurrent.CompletableFuture
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala
similarity index 75%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala
index 2f850b329eb..446ac5b3cdc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala
@@ -17,12 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
 
 trait FlushNetworkBufferHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala
similarity index 78%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala
index b1f0cc1e9da..bf45d8eff9a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.executor._
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.executor._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   InitializeExecutorRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.operator.source.cache.CacheSourceOpExec
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.operator.source.cache.CacheSourceOpExec
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 import java.net.URI
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala
index 2ff9697cdff..81298a58d88 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala
@@ -17,12 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
 
 trait OpenExecutorHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala
similarity index 71%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala
index ce191316c7d..cec7ca87e63 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala
@@ -17,13 +17,23 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING}
-import edu.uci.ics.amber.engine.architecture.worker.{DataProcessorRPCHandlerInitializer, UserPause}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{
+  PAUSED,
+  READY,
+  RUNNING
+}
+import org.apache.texera.amber.engine.architecture.worker.{
+  DataProcessorRPCHandlerInitializer,
+  UserPause
+}
 
 trait PauseHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala
index 199ad8cfc1f..3333f54e90d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   PrepareCheckpointRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
-import edu.uci.ics.amber.engine.architecture.worker.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
+import org.apache.texera.amber.engine.architecture.worker.{
   DataProcessorRPCHandlerInitializer,
   WorkflowWorker
 }
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState}
-import edu.uci.ics.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState}
 
 import java.util.concurrent.CompletableFuture
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala
similarity index 71%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala
index 7ef4471e4b1..74d8d14faa6 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala
@@ -17,13 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkerMetricsResponse
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerMetrics
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerMetricsResponse
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerMetrics
 
 trait QueryStatisticsHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala
similarity index 72%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala
index 28e35a11ce3..434c50c914c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala
@@ -17,13 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, RUNNING}
-import edu.uci.ics.amber.engine.architecture.worker.{DataProcessorRPCHandlerInitializer, UserPause}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, RUNNING}
+import org.apache.texera.amber.engine.architecture.worker.{
+  DataProcessorRPCHandlerInitializer,
+  UserPause
+}
 
 trait ResumeHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala
index 6061ad6370e..2b0721a2525 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala
@@ -17,12 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
 
 trait RetrieveStateHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala
similarity index 69%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala
index 36918015388..01cbb858bd7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala
@@ -17,15 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_CHANNEL
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.error.ErrorUtils.safely
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_CHANNEL
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.error.ErrorUtils.safely
 
 trait StartChannelHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartHandler.scala
similarity index 75%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartHandler.scala
index 13343d04db0..5d1bf8ccbde 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartHandler.scala
@@ -17,17 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker.promisehandlers
+package org.apache.texera.amber.engine.architecture.worker.promisehandlers
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{READY, RUNNING}
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse
+import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{READY, RUNNING}
 
 trait StartHandler {
   this: DataProcessorRPCHandlerInitializer =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberConfig.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberConfig.scala
index 6d5c43b6a90..2b05cc771af 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberConfig.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
-import akka.actor.Address
+import org.apache.pekko.actor.Address
 
 object AmberConfig {
-  var masterNodeAddr: Address = Address("akka", "Amber", "localhost", 2552)
+  var masterNodeAddr: Address = Address("pekko", "Amber", "localhost", 2552)
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberKryoInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberKryoInitializer.scala
similarity index 66%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberKryoInitializer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberKryoInitializer.scala
index de63850c656..1721764d414 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberKryoInitializer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberKryoInitializer.scala
@@ -17,19 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
-import akka.actor.ExtendedActorSystem
-import com.esotericsoftware.kryo.serializers.ClosureSerializer
-import com.esotericsoftware.kryo.serializers.ClosureSerializer.Closure
-import io.altoo.akka.serialization.kryo.DefaultKryoInitializer
-import io.altoo.akka.serialization.kryo.serializer.scala.ScalaKryo
+import com.esotericsoftware.kryo.kryo5.serializers.ClosureSerializer
+import io.altoo.serialization.kryo.pekko.DefaultKryoInitializer
+import io.altoo.serialization.kryo.scala.serializer.ScalaKryo
 
 import java.lang.invoke.SerializedLambda
 
 class AmberKryoInitializer extends DefaultKryoInitializer {
-  override def preInit(kryo: ScalaKryo, system: ExtendedActorSystem): Unit = {
+  override def preInit(kryo: ScalaKryo): Unit = {
     kryo.register(classOf[SerializedLambda])
-    kryo.register(classOf[Closure], new ClosureSerializer())
+    kryo.register(classOf[ClosureSerializer.Closure], new ClosureSerializer())
   }
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberLogging.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberLogging.scala
index 50047408e45..0fd16475d9f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberLogging.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
 import com.typesafe.scalalogging.Logger
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.util.VirtualIdentityUtils
 import org.slf4j.LoggerFactory
 
 trait AmberLogging {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberRuntime.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberRuntime.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala
index 2ecf0acd1f4..7078f766a63 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberRuntime.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
-import akka.actor.{ActorSystem, Address, Cancellable, DeadLetter, Props}
-import akka.serialization.{Serialization, SerializationExtension}
-import edu.uci.ics.amber.config.AkkaConfig
+import org.apache.pekko.actor.{ActorSystem, Address, Cancellable, DeadLetter, Props}
+import org.apache.pekko.serialization.{Serialization, SerializationExtension}
 import com.typesafe.config.{Config, ConfigFactory}
-import edu.uci.ics.amber.clustering.ClusterListener
-import edu.uci.ics.amber.engine.architecture.messaginglayer.DeadLetterMonitorActor
+import org.apache.texera.amber.clustering.ClusterListener
+import org.apache.texera.amber.config.AkkaConfig
+import org.apache.texera.amber.engine.architecture.messaginglayer.DeadLetterMonitorActor
 
 import java.io.{BufferedReader, InputStreamReader}
 import java.net.URL
@@ -79,9 +79,9 @@ object AmberRuntime {
 
     val masterConfig = ConfigFactory
       .parseString(s"""
-        akka.remote.artery.canonical.port = 2552
-        akka.remote.artery.canonical.hostname = $localIpAddress
-        akka.cluster.seed-nodes = [ "akka://Amber@$localIpAddress:2552" ]
+        pekko.remote.artery.canonical.port = 2552
+        pekko.remote.artery.canonical.hostname = $localIpAddress
+        pekko.cluster.seed-nodes = [ "pekko://Amber@$localIpAddress:2552" ]
         """)
       .withFallback(akkaConfig)
       .resolve()
@@ -91,7 +91,7 @@ object AmberRuntime {
 
   def akkaConfig: Config = AkkaConfig.akkaConfig
 
-  private def createMasterAddress(addr: String): Address = Address("akka", "Amber", addr, 2552)
+  private def createMasterAddress(addr: String): Address = Address("pekko", "Amber", addr, 2552)
 
   def startActorWorker(mainNodeAddress: Option[String]): Unit = {
     val addr = mainNodeAddress.getOrElse("localhost")
@@ -101,9 +101,9 @@ object AmberRuntime {
     }
     val workerConfig = ConfigFactory
       .parseString(s"""
-        akka.remote.artery.canonical.hostname = $localIpAddress
-        akka.remote.artery.canonical.port = 0
-        akka.cluster.seed-nodes = [ "akka://Amber@$addr:2552" ]
+        pekko.remote.artery.canonical.hostname = $localIpAddress
+        pekko.remote.artery.canonical.port = 0
+        pekko.cluster.seed-nodes = [ "pekko://Amber@$addr:2552" ]
         """)
       .withFallback(akkaConfig)
       .resolve()
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointState.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointState.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointState.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointState.scala
index 7baa912e4f5..0f1159a2ef7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointState.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointState.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointSupport.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointSupport.scala
index dde632e9944..d409e5da91e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointSupport.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.tuple.TupleLike
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 trait CheckpointSupport {
   def serializeState(
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ElidableStatement.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ElidableStatement.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala
index ade454b1ddc..bf78b290c31 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ElidableStatement.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
 import scala.annotation.elidable
 import scala.annotation.elidable._
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/FutureBijection.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/FutureBijection.scala
similarity index 97%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/FutureBijection.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/FutureBijection.scala
index 2d634b2d2b6..41f8113ef52 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/FutureBijection.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/FutureBijection.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
 import com.twitter.util.{Return, Throw, Future => TwitterFuture, Promise => TwitterPromise}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SerializedState.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/SerializedState.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SerializedState.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/SerializedState.scala
index 5ee3047b481..c1a7bae6b88 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SerializedState.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/SerializedState.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
-import akka.serialization.{Serialization, Serializers}
+import org.apache.pekko.serialization.{Serialization, Serializers}
 
 object SerializedState {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/Utils.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/Utils.scala
similarity index 97%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/Utils.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/Utils.scala
index ba07aeb61dd..dc074c1094d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/Utils.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/Utils.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common
+package org.apache.texera.amber.engine.common
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
 
 import java.nio.file.{Files, Path, Paths}
 import java.util.concurrent.locks.Lock
@@ -30,7 +30,7 @@ object Utils extends LazyLogging {
 
   /**
     * Gets the real path of the amber home directory by:
-    * 1): check if the current directory is texera/core/amber
+    * 1): check if the current directory is texera/amber
     * if it's not then:
     * 2): search the siblings and children to find the texera home path
     *
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/amberexception/BreakpointException.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/amberexception/BreakpointException.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/amberexception/BreakpointException.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/amberexception/BreakpointException.scala
index ec8b6b92c9b..647a5248ece 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/amberexception/BreakpointException.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/amberexception/BreakpointException.scala
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.amberexception
+package org.apache.texera.amber.engine.common.amberexception
 
-import edu.uci.ics.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.WorkflowRuntimeException
 
 class BreakpointException extends WorkflowRuntimeException("breakpoint triggered") {}
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DataPayload.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DataPayload.scala
index e5b59e8825e..54f577a0beb 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DataPayload.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.ambermessage
+package org.apache.texera.amber.engine.common.ambermessage
 
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.tuple.Tuple
 
 sealed trait DataPayload extends WorkflowFIFOMessagePayload {}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DirectControlMessagePayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DirectControlMessagePayload.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DirectControlMessagePayload.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DirectControlMessagePayload.scala
index 6fc5d47773a..1f95cbcbc5e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DirectControlMessagePayload.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DirectControlMessagePayload.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.ambermessage
+package org.apache.texera.amber.engine.common.ambermessage
 
 trait DirectControlMessagePayload extends WorkflowFIFOMessagePayload
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/RecoveryPayload.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/RecoveryPayload.scala
index 82f31dd5098..dcd83f3a3fc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/RecoveryPayload.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.ambermessage
+package org.apache.texera.amber.engine.common.ambermessage
 
-import akka.actor.{ActorRef, Address}
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.pekko.actor.{ActorRef, Address}
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
 
 sealed trait RecoveryPayload extends Serializable {}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala
index dd002c4fd8d..e77ed2a2b88 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.ambermessage
+package org.apache.texera.amber.engine.common.ambermessage
 
 trait WorkflowFIFOMessagePayload extends Serializable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowMessage.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowMessage.scala
index c6d0ca3b3f4..a54d4c20310 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowMessage.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.ambermessage
+package org.apache.texera.amber.engine.common.ambermessage
 
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
 
 case object WorkflowMessage {
   def getInMemSize(msg: WorkflowMessage): Long = {
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/AmberClient.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/client/AmberClient.scala
index f19c8ca4ce9..91d2ba06ba5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/AmberClient.scala
@@ -17,28 +17,31 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.client
+package org.apache.texera.amber.engine.common.client
 
-import akka.actor.{ActorSystem, Address, PoisonPill, Props}
-import akka.pattern._
-import akka.util.Timeout
+import org.apache.pekko.actor.{ActorSystem, Address, PoisonPill, Props}
+import org.apache.pekko.pattern._
+import org.apache.pekko.util.Timeout
 import com.twitter.util.{Future, Promise}
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ControlRequest
-import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.ControlReturn
-import edu.uci.ics.amber.engine.common.FutureBijection._
-import edu.uci.ics.amber.engine.common.ambermessage.{NotifyFailedNode, WorkflowRecoveryMessage}
-import edu.uci.ics.amber.engine.common.client.ClientActor.{
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.subjects.PublishSubject
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.controller.ControllerConfig
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ControlRequest
+import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.ControlReturn
+import org.apache.texera.amber.engine.common.FutureBijection._
+import org.apache.texera.amber.engine.common.ambermessage.{
+  NotifyFailedNode,
+  WorkflowRecoveryMessage
+}
+import org.apache.texera.amber.engine.common.client.ClientActor.{
   CommandRequest,
   InitializeRequest,
   ObservableRequest
 }
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CLIENT
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import org.apache.texera.amber.engine.common.virtualidentity.util.CLIENT
 
 import java.lang.reflect.{InvocationHandler, Method, Proxy}
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/ClientActor.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/client/ClientActor.scala
index 0c2b26e9502..9df86ec3ffe 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/ClientActor.scala
@@ -17,43 +17,50 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.client
+package org.apache.texera.amber.engine.common.client
 
-import akka.actor.{Actor, ActorRef}
-import akka.pattern.StatusReply.Ack
+import org.apache.pekko.actor.{Actor, ActorRef}
+import org.apache.pekko.pattern.StatusReply.Ack
 import com.twitter.util.Promise
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.{
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{
   CreditRequest,
   CreditResponse,
   NetworkAck,
   NetworkMessage
 }
-import edu.uci.ics.amber.engine.architecture.controller.{ClientEvent, Controller, ControllerConfig}
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, ControlRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{
+import org.apache.texera.amber.engine.architecture.controller.{
+  ClientEvent,
+  Controller,
+  ControllerConfig
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  ControlRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
   ControlError,
   ControlReturn,
   ReturnInvocation
 }
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.engine.common.ambermessage.{
-  DirectControlMessagePayload,
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.engine.common.ambermessage.{
   DataPayload,
+  DirectControlMessagePayload,
   WorkflowFIFOMessage,
   WorkflowRecoveryMessage
 }
-import edu.uci.ics.amber.engine.common.client.ClientActor.{
+import org.apache.texera.amber.engine.common.client.ClientActor.{
   ClosureRequest,
   CommandRequest,
   InitializeRequest,
   ObservableRequest
 }
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient
-import edu.uci.ics.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER}
-import edu.uci.ics.amber.error.ErrorUtils.reconstructThrowable
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient
+import org.apache.texera.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER}
+import org.apache.texera.amber.error.ErrorUtils.reconstructThrowable
 
 import scala.collection.mutable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCClient.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCClient.scala
index 2fbe50d992f..704ebd7f476 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCClient.scala
@@ -17,30 +17,30 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.rpc
+package org.apache.texera.amber.engine.common.rpc
 
 import com.twitter.util.{Future, Promise}
-import edu.uci.ics.amber.engine.architecture.controller.ClientEvent
-import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkOutputGateway
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{
+import io.grpc.MethodDescriptor
+import org.apache.texera.amber.core.virtualidentity.{
+  ActorVirtualIdentity,
+  ChannelIdentity,
+  EmbeddedControlMessageIdentity
+}
+import org.apache.texera.amber.engine.architecture.controller.ClientEvent
+import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
   ControlError,
   ControlReturn,
   ReturnInvocation,
   WorkerMetricsResponse
 }
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.createProxy
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CLIENT
-import edu.uci.ics.amber.error.ErrorUtils.reconstructThrowable
-import edu.uci.ics.amber.core.virtualidentity.{
-  ActorVirtualIdentity,
-  ChannelIdentity,
-  EmbeddedControlMessageIdentity
-}
-import io.grpc.MethodDescriptor
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.createProxy
+import org.apache.texera.amber.engine.common.virtualidentity.util.CLIENT
+import org.apache.texera.amber.error.ErrorUtils.reconstructThrowable
 
 import java.lang.reflect.{InvocationHandler, Method, Proxy}
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala
index 9015ca671cd..f658e0875f7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.rpc
+package org.apache.texera.amber.engine.common.rpc
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.controller.ClientEvent
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   ChannelIdentity,
   EmbeddedControlMessageIdentity
 }
+import org.apache.texera.amber.engine.architecture.controller.ClientEvent
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc
 
 import scala.language.implicitConversions
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCServer.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCServer.scala
index 9cdad1e6143..e9a3e2cc455 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCServer.scala
@@ -17,19 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.rpc
+package org.apache.texera.amber.engine.common.rpc
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkOutputGateway
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   ControlInvocation,
   ControlRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{ControlReturn, ReturnInvocation}
-import edu.uci.ics.amber.engine.common.AmberLogging
-import edu.uci.ics.amber.error.ErrorUtils.mkControlError
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
+  ControlReturn,
+  ReturnInvocation
+}
+import org.apache.texera.amber.engine.common.AmberLogging
+import org.apache.texera.amber.error.ErrorUtils.mkControlError
 
 import java.lang.reflect.Method
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/StateManager.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/StateManager.scala
index 251e1b5f109..9bd951389ea 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/StateManager.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.statetransition
+package org.apache.texera.amber.engine.common.statetransition
 
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.engine.common.statetransition.StateManager.{
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.common.statetransition.StateManager.{
   InvalidStateException,
   InvalidTransitionException
 }
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
 
 object StateManager {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/WorkerStateManager.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/WorkerStateManager.scala
index 02fa8c1a7d3..4f5e92e0ae7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/WorkerStateManager.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.statetransition
+package org.apache.texera.amber.engine.common.statetransition
 
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState._
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState._
 
 // The following pattern is a good practice of enum in scala
 // We've always used this pattern in the codebase
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/EmptyRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/EmptyRecordStorage.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/EmptyRecordStorage.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/EmptyRecordStorage.scala
index 609f20d0206..0dbbd61b519 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/EmptyRecordStorage.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/EmptyRecordStorage.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.storage
+package org.apache.texera.amber.engine.common.storage
 
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.{
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{
   SequentialRecordReader,
   SequentialRecordWriter
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/HDFSRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/HDFSRecordStorage.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/HDFSRecordStorage.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/HDFSRecordStorage.scala
index 5d8a8ed3314..07d6bab0373 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/HDFSRecordStorage.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/HDFSRecordStorage.scala
@@ -17,10 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.storage
+package org.apache.texera.amber.engine.common.storage
 
 import com.typesafe.scalalogging.LazyLogging
-import SequentialRecordStorage.{SequentialRecordReader, SequentialRecordWriter}
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{
+  SequentialRecordReader,
+  SequentialRecordWriter
+}
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.{FileSystem, Path}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/SequentialRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/SequentialRecordStorage.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/SequentialRecordStorage.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/SequentialRecordStorage.scala
index 73a9f2c61fb..f5664e6a49c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/SequentialRecordStorage.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/SequentialRecordStorage.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.storage
+package org.apache.texera.amber.engine.common.storage
 
 import com.esotericsoftware.kryo.io.{Input, Output}
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.{
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{
   SequentialRecordReader,
   SequentialRecordWriter
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/VFSRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/VFSRecordStorage.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/VFSRecordStorage.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/VFSRecordStorage.scala
index 3df9b861bc2..a514360d6d6 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/storage/VFSRecordStorage.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/VFSRecordStorage.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.storage
+package org.apache.texera.amber.engine.common.storage
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.{
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{
   SequentialRecordReader,
   SequentialRecordWriter
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/virtualidentity/util.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala
rename to amber/src/main/scala/org/apache/texera/amber/engine/common/virtualidentity/util.scala
index 58a9138d54c..481aecab1dc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/virtualidentity/util.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.virtualidentity
+package org.apache.texera.amber.engine.common.virtualidentity
 
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
 
 object util {
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala b/amber/src/main/scala/org/apache/texera/amber/error/ErrorUtils.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala
rename to amber/src/main/scala/org/apache/texera/amber/error/ErrorUtils.scala
index e5f972a3406..af16044af29 100644
--- a/core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala
+++ b/amber/src/main/scala/org/apache/texera/amber/error/ErrorUtils.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.error
+package org.apache.texera.amber.error
 
 import com.google.protobuf.timestamp.Timestamp
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessage
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.ERROR
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{ControlError, ErrorLanguage}
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessage
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.ERROR
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ControlError, ErrorLanguage}
+import org.apache.texera.amber.util.VirtualIdentityUtils
 
 import java.time.Instant
 import scala.util.control.ControlThrowable
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala b/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala
similarity index 74%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala
rename to amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala
index 77602673112..225f5c152a5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala
+++ b/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala
@@ -17,38 +17,37 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.{ApplicationConfig, StorageConfig}
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
-  COMPLETED,
-  FAILED
-}
-import edu.uci.ics.amber.engine.common.AmberRuntime.scheduleRecurringCallThroughActorSystem
-import edu.uci.ics.amber.engine.common.Utils.maptoStatusCode
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.{AmberRuntime, Utils}
-import edu.uci.ics.amber.core.virtualidentity.ExecutionIdentity
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.util.ObjectMapperUtils
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.web.auth.JwtAuth.setupJwtAuth
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions
-import edu.uci.ics.texera.web.resource.{WebsocketPayloadSizeTuner, WorkflowWebsocketResource}
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
-import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService
 import io.dropwizard.Configuration
 import io.dropwizard.setup.{Bootstrap, Environment}
 import io.dropwizard.websockets.WebsocketBundle
+import org.apache.texera.amber.config.{ApplicationConfig, StorageConfig}
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.controller.ControllerConfig
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
+  COMPLETED,
+  FAILED
+}
+import org.apache.texera.amber.engine.common.AmberRuntime.scheduleRecurringCallThroughActorSystem
+import org.apache.texera.amber.engine.common.Utils.maptoStatusCode
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.{AmberRuntime, Utils}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.util.ObjectMapperUtils
 import org.apache.commons.jcs3.access.exception.InvalidArgumentException
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions
+import org.apache.texera.web.auth.JwtAuth.setupJwtAuth
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.resource.{WebsocketPayloadSizeTuner, WorkflowWebsocketResource}
+import org.apache.texera.web.service.ExecutionsMetadataPersistService
 import org.eclipse.jetty.server.session.SessionHandler
 import org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter
 
@@ -156,30 +155,28 @@ class ComputingUnitMaster extends io.dropwizard.Application[Configuration] with
         new WebsocketPayloadSizeTuner(ApplicationConfig.maxWorkflowWebsocketRequestPayloadSizeKb)
       )
 
-    if (UserSystemConfig.isUserSystemEnabled) {
-      val timeToLive: Int = ApplicationConfig.sinkStorageTTLInSecs
-      if (ApplicationConfig.cleanupAllExecutionResults) {
-        // do one time cleanup of collections that were not closed gracefully before restart/crash
-        // retrieve all executions that were executing before the reboot.
-        val allExecutionsBeforeRestart: List[WorkflowExecutions] =
-          WorkflowExecutionsResource.getExpiredExecutionsWithResultOrLog(-1)
-        cleanExecutions(
-          allExecutionsBeforeRestart,
-          statusByte => {
-            if (statusByte != maptoStatusCode(COMPLETED)) {
-              maptoStatusCode(FAILED) // for incomplete executions, mark them as failed.
-            } else {
-              statusByte
-            }
+    val timeToLive: Int = ApplicationConfig.sinkStorageTTLInSecs
+    if (ApplicationConfig.cleanupAllExecutionResults) {
+      // do one time cleanup of collections that were not closed gracefully before restart/crash
+      // retrieve all executions that were executing before the reboot.
+      val allExecutionsBeforeRestart: List[WorkflowExecutions] =
+        WorkflowExecutionsResource.getExpiredExecutionsWithResultOrLog(-1)
+      cleanExecutions(
+        allExecutionsBeforeRestart,
+        statusByte => {
+          if (statusByte != maptoStatusCode(COMPLETED)) {
+            maptoStatusCode(FAILED) // for incomplete executions, mark them as failed.
+          } else {
+            statusByte
           }
-        )
-      }
-      scheduleRecurringCallThroughActorSystem(
-        2.seconds,
-        ApplicationConfig.sinkStorageCleanUpCheckIntervalInSecs.seconds
-      ) {
-        recurringCheckExpiredResults(timeToLive)
-      }
+        }
+      )
+    }
+    scheduleRecurringCallThroughActorSystem(
+      2.seconds,
+      ApplicationConfig.sinkStorageCleanUpCheckIntervalInSecs.seconds
+    ) {
+      recurringCheckExpiredResults(timeToLive)
     }
 
     environment.jersey.register(classOf[WorkflowExecutionsResource])
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitWorker.scala b/amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitWorker.scala
rename to amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala
index 0830e242a9b..e17acb98f24 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitWorker.scala
+++ b/amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
-import edu.uci.ics.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.AmberRuntime
 import org.apache.commons.jcs3.access.exception.InvalidArgumentException
 
 import scala.annotation.tailrec
diff --git a/amber/src/main/scala/org/apache/texera/web/ServletAwareConfigurator.scala b/amber/src/main/scala/org/apache/texera/web/ServletAwareConfigurator.scala
new file mode 100644
index 00000000000..6ee33a38553
--- /dev/null
+++ b/amber/src/main/scala/org/apache/texera/web/ServletAwareConfigurator.scala
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.web
+
+import com.typesafe.scalalogging.LazyLogging
+import org.apache.http.client.utils.URLEncodedUtils
+import org.apache.texera.auth.JwtAuth.jwtConsumer
+import org.apache.texera.auth.util.HeaderField
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+
+import java.net.URI
+import java.nio.charset.Charset
+import javax.websocket.HandshakeResponse
+import javax.websocket.server.{HandshakeRequest, ServerEndpointConfig}
+import scala.jdk.CollectionConverters.{ListHasAsScala, _}
+
+/**
+  * This configurator extracts HTTPSession and associates it to ServerEndpointConfig,
+  * allow it to be accessed by Websocket connections.
+  * <pre>
+  * See <a href="https://stackoverflow.com/questions/17936440/accessing-httpsession-
+  * from-httpservletrequest-in-a-web-socket-serverendpoint"></a>
+  * </pre>
+  */
+class ServletAwareConfigurator extends ServerEndpointConfig.Configurator with LazyLogging {
+
+  override def modifyHandshake(
+      config: ServerEndpointConfig,
+      request: HandshakeRequest,
+      response: HandshakeResponse
+  ): Unit = {
+    try {
+      val headers = request.getHeaders.asScala.view.mapValues(_.asScala.headOption).toMap
+      if (
+        headers.contains(HeaderField.UserComputingUnitAccess) &&
+        headers.contains(HeaderField.UserId) &&
+        headers.contains(HeaderField.UserName) &&
+        headers.contains(HeaderField.UserEmail)
+      ) {
+        // KUBERNETES MODE: Construct the User object from trusted headers
+        // coming from envoy and generated by access control service.
+
+        val userId = headers.get(HeaderField.UserId).flatten.map(_.toInt).get
+        val userName = headers.get(HeaderField.UserName).flatten.get
+        val userEmail = headers.get(HeaderField.UserEmail).flatten.get
+        val cuAccess = headers.get(HeaderField.UserComputingUnitAccess).flatten.getOrElse("")
+        config.getUserProperties.put(HeaderField.UserComputingUnitAccess, cuAccess)
+        logger.info(
+          s"User ID: $userId, User Name: $userName, User Email: $userEmail with CU Access: $cuAccess"
+        )
+
+        config.getUserProperties.put(
+          classOf[User].getName,
+          new User(
+            userId,
+            userName,
+            userEmail,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+          )
+        )
+        logger.debug(s"User created from headers: ID=$userId, Name=$userName")
+      } else {
+        // SINGLE NODE MODE: Construct the User object from JWT in query parameters.
+        val params =
+          URLEncodedUtils.parse(new URI("?" + request.getQueryString), Charset.defaultCharset())
+        config.getUserProperties.put(
+          HeaderField.UserComputingUnitAccess,
+          PrivilegeEnum.WRITE.name()
+        )
+        params.asScala
+          .map(pair => pair.getName -> pair.getValue)
+          .toMap
+          .get("access-token")
+          .map(token => {
+            val claims = jwtConsumer.process(token).getJwtClaims
+            config.getUserProperties.put(
+              classOf[User].getName,
+              new User(
+                claims.getClaimValue("userId").asInstanceOf[Long].toInt,
+                claims.getSubject,
+                String.valueOf(claims.getClaimValue("email").asInstanceOf[String]),
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+              )
+            )
+          })
+      }
+    } catch {
+      case e: Exception =>
+        logger.error("Failed to retrieve the User during websocket handshake", e)
+    }
+
+  }
+}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala b/amber/src/main/scala/org/apache/texera/web/SessionState.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala
rename to amber/src/main/scala/org/apache/texera/web/SessionState.scala
index 3d296349a67..b50df866afe 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala
+++ b/amber/src/main/scala/org/apache/texera/web/SessionState.scala
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
-import edu.uci.ics.texera.web.service.WorkflowService
 import io.reactivex.rxjava3.disposables.Disposable
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.service.WorkflowService
 
 import javax.websocket.Session
 import scala.collection.mutable
@@ -53,6 +54,7 @@ class SessionState(session: Session) {
   private var currentWorkflowState: Option[WorkflowService] = None
   private var workflowSubscription = Disposable.empty()
   private var executionSubscription = Disposable.empty()
+  private var userComputingUnitAccess: PrivilegeEnum = PrivilegeEnum.NONE
 
   def send(msg: TexeraWebSocketEvent): Unit = {
     session.getAsyncRemote.sendText(objectMapper.writeValueAsString(msg))
@@ -80,4 +82,9 @@ class SessionState(session: Session) {
     )
 
   }
+
+  def setUserComputingUnitAccess(cuAccess: PrivilegeEnum): Unit = {
+    this.userComputingUnitAccess = cuAccess
+  }
+  def getUserComputingUnitAccess: PrivilegeEnum = this.userComputingUnitAccess
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/SubscriptionManager.scala b/amber/src/main/scala/org/apache/texera/web/SubscriptionManager.scala
similarity index 97%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/SubscriptionManager.scala
rename to amber/src/main/scala/org/apache/texera/web/SubscriptionManager.scala
index e59905988be..3671d1e4b6e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/SubscriptionManager.scala
+++ b/amber/src/main/scala/org/apache/texera/web/SubscriptionManager.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
 import io.reactivex.rxjava3.disposables.Disposable
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala b/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala
similarity index 80%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala
rename to amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala
index a74b40c6710..4264a9ca180 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala
+++ b/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala
@@ -17,40 +17,40 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.github.dirkraft.dropwizard.fileassets.FileAssetsBundle
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.engine.common.Utils
-import edu.uci.ics.amber.util.ObjectMapperUtils
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.web.auth.JwtAuth.setupJwtAuth
-import edu.uci.ics.texera.web.resource._
-import edu.uci.ics.texera.web.resource.auth.{AuthResource, GoogleAuthResource}
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource
-import edu.uci.ics.texera.web.resource.dashboard.admin.execution.AdminExecutionResource
-import edu.uci.ics.texera.web.resource.dashboard.admin.user.AdminUserResource
-import edu.uci.ics.texera.web.resource.dashboard.admin.settings.AdminSettingsResource
-import edu.uci.ics.texera.web.resource.dashboard.hub.HubResource
-import edu.uci.ics.texera.web.resource.dashboard.user.project.{
+import io.dropwizard.auth.AuthValueFactoryProvider
+import io.dropwizard.setup.{Bootstrap, Environment}
+import io.dropwizard.websockets.WebsocketBundle
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.engine.common.Utils
+import org.apache.texera.amber.util.ObjectMapperUtils
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.web.auth.JwtAuth.setupJwtAuth
+import org.apache.texera.web.resource._
+import org.apache.texera.web.resource.auth.{AuthResource, GoogleAuthResource}
+import org.apache.texera.web.resource.dashboard.DashboardResource
+import org.apache.texera.web.resource.dashboard.admin.execution.AdminExecutionResource
+import org.apache.texera.web.resource.dashboard.admin.settings.AdminSettingsResource
+import org.apache.texera.web.resource.dashboard.admin.user.AdminUserResource
+import org.apache.texera.web.resource.dashboard.hub.HubResource
+import org.apache.texera.web.resource.dashboard.user.UserResource
+import org.apache.texera.web.resource.dashboard.user.project.{
   ProjectAccessResource,
   ProjectResource,
   PublicProjectResource
 }
-import edu.uci.ics.texera.web.resource.dashboard.user.quota.UserQuotaResource
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.{
+import org.apache.texera.web.resource.dashboard.user.quota.UserQuotaResource
+import org.apache.texera.web.resource.dashboard.user.workflow.{
   WorkflowAccessResource,
   WorkflowExecutionsResource,
   WorkflowResource,
   WorkflowVersionResource
 }
-import io.dropwizard.auth.AuthValueFactoryProvider
-import io.dropwizard.setup.{Bootstrap, Environment}
-import io.dropwizard.websockets.WebsocketBundle
 import org.eclipse.jetty.server.session.SessionHandler
 import org.eclipse.jetty.servlet.ErrorPageErrorHandler
 import org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter
@@ -85,7 +85,7 @@ class TexeraWebApplication
 
   override def initialize(bootstrap: Bootstrap[TexeraWebConfiguration]): Unit = {
     // serve static frontend GUI files
-    bootstrap.addBundle(new FileAssetsBundle("../gui/dist", "/", "index.html"))
+    bootstrap.addBundle(new FileAssetsBundle("../../frontend/dist", "/", "index.html"))
     // add websocket bundle
     bootstrap.addBundle(new WebsocketBundle(classOf[CollaborationResource]))
     // register scala module to dropwizard default object mapper
@@ -141,6 +141,7 @@ class TexeraWebApplication
     environment.jersey.register(classOf[WorkflowAccessResource])
     environment.jersey.register(classOf[WorkflowResource])
     environment.jersey.register(classOf[HubResource])
+    environment.jersey.register(classOf[UserResource])
     environment.jersey.register(classOf[WorkflowVersionResource])
     environment.jersey.register(classOf[ProjectResource])
     environment.jersey.register(classOf[ProjectAccessResource])
@@ -152,8 +153,6 @@ class TexeraWebApplication
     environment.jersey.register(classOf[AdminSettingsResource])
     environment.jersey.register(classOf[AIAssistantResource])
 
-    if (UserSystemConfig.isUserSystemEnabled) {
-      AuthResource.createAdminUser()
-    }
+    AuthResource.createAdminUser()
   }
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebConfiguration.java b/amber/src/main/scala/org/apache/texera/web/TexeraWebConfiguration.java
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebConfiguration.java
rename to amber/src/main/scala/org/apache/texera/web/TexeraWebConfiguration.java
index a2b9f8a141f..e7fcca9aa3c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebConfiguration.java
+++ b/amber/src/main/scala/org/apache/texera/web/TexeraWebConfiguration.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web;
+package org.apache.texera.web;
 
 import io.dropwizard.Configuration;
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/WebsocketInput.scala b/amber/src/main/scala/org/apache/texera/web/WebsocketInput.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/WebsocketInput.scala
rename to amber/src/main/scala/org/apache/texera/web/WebsocketInput.scala
index 499bf09b6c4..95e7b885795 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/WebsocketInput.scala
+++ b/amber/src/main/scala/org/apache/texera/web/WebsocketInput.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
-import edu.uci.ics.texera.web.model.websocket.request.TexeraWebSocketRequest
 import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.subjects.PublishSubject
+import org.apache.texera.web.model.websocket.request.TexeraWebSocketRequest
 
 import scala.reflect.{ClassTag, classTag}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala b/amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala
rename to amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala
index 2c58537bbcd..6f2f456dda7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala
+++ b/amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web
+package org.apache.texera.web
 
-import akka.actor.Cancellable
+import org.apache.pekko.actor.Cancellable
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.engine.common.executionruntimestate.ExecutionMetadataStore
-import edu.uci.ics.texera.web.storage.ExecutionStateStore
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionMetadataStore
+import org.apache.texera.web.storage.ExecutionStateStore
 
 import java.time.{LocalDateTime, Duration => JDuration}
 import scala.concurrent.duration.DurationInt
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/GuestAuthFilter.scala b/amber/src/main/scala/org/apache/texera/web/auth/GuestAuthFilter.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/auth/GuestAuthFilter.scala
rename to amber/src/main/scala/org/apache/texera/web/auth/GuestAuthFilter.scala
index fb5ecc6e5dc..5946c40f11c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/GuestAuthFilter.scala
+++ b/amber/src/main/scala/org/apache/texera/web/auth/GuestAuthFilter.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.auth
+package org.apache.texera.web.auth
 
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.web.auth.GuestAuthFilter.GUEST
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
 import io.dropwizard.auth.AuthFilter
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.auth.GuestAuthFilter.GUEST
 
 import java.io.IOException
 import java.util.Optional
@@ -39,7 +39,7 @@ import javax.ws.rs.core.SecurityContext
   }
 
   val GUEST: User =
-    new User(null, "guest", null, null, null, null, UserRoleEnum.REGULAR, null, null)
+    new User(null, "guest", null, null, null, null, UserRoleEnum.REGULAR, null, null, null)
 }
 
 @PreMatching
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/JwtAuth.scala b/amber/src/main/scala/org/apache/texera/web/auth/JwtAuth.scala
similarity index 56%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/auth/JwtAuth.scala
rename to amber/src/main/scala/org/apache/texera/web/auth/JwtAuth.scala
index 0847102929f..c1ade508869 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/JwtAuth.scala
+++ b/amber/src/main/scala/org/apache/texera/web/auth/JwtAuth.scala
@@ -17,39 +17,29 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.auth
+package org.apache.texera.web.auth
 
 import com.github.toastshaman.dropwizard.auth.jwt.JwtAuthFilter
-import edu.uci.ics.texera.auth.JwtAuth.jwtConsumer
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.config.UserSystemConfig
 import io.dropwizard.auth.AuthDynamicFeature
 import io.dropwizard.setup.Environment
+import org.apache.texera.auth.JwtAuth.jwtConsumer
+import org.apache.texera.auth.SessionUser
 
 // TODO: move this logic to Auth
 @Deprecated
 object JwtAuth {
   def setupJwtAuth(environment: Environment): Unit = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      // register JWT Auth layer
-      environment.jersey.register(
-        new AuthDynamicFeature(
-          new JwtAuthFilter.Builder[SessionUser]()
-            .setJwtConsumer(jwtConsumer)
-            .setRealm("realm")
-            .setPrefix("Bearer")
-            .setAuthenticator(UserAuthenticator)
-            .setAuthorizer(UserRoleAuthorizer)
-            .buildAuthFilter()
-        )
+    // register JWT Auth layer
+    environment.jersey.register(
+      new AuthDynamicFeature(
+        new JwtAuthFilter.Builder[SessionUser]()
+          .setJwtConsumer(jwtConsumer)
+          .setRealm("realm")
+          .setPrefix("Bearer")
+          .setAuthenticator(UserAuthenticator)
+          .setAuthorizer(UserRoleAuthorizer)
+          .buildAuthFilter()
       )
-    } else {
-      // register Guest Auth layer
-      environment.jersey.register(
-        new AuthDynamicFeature(
-          new GuestAuthFilter.Builder().setAuthorizer(UserRoleAuthorizer).buildAuthFilter()
-        )
-      )
-    }
+    )
   }
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserAuthenticator.scala b/amber/src/main/scala/org/apache/texera/web/auth/UserAuthenticator.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserAuthenticator.scala
rename to amber/src/main/scala/org/apache/texera/web/auth/UserAuthenticator.scala
index b820a87cd4a..2a6a2e47707 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserAuthenticator.scala
+++ b/amber/src/main/scala/org/apache/texera/web/auth/UserAuthenticator.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.auth
+package org.apache.texera.web.auth
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
 import io.dropwizard.auth.Authenticator
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
 import org.jose4j.jwt.consumer.JwtContext
 
 import java.time.OffsetDateTime
@@ -44,7 +44,18 @@ object UserAuthenticator extends Authenticator[JwtContext, SessionUser] with Laz
       val accountCreation =
         context.getJwtClaims.getClaimValue("accountCreation").asInstanceOf[OffsetDateTime]
       val user =
-        new User(userId, userName, email, null, googleId, null, role, comment, accountCreation)
+        new User(
+          userId,
+          userName,
+          email,
+          null,
+          googleId,
+          null,
+          role,
+          comment,
+          accountCreation,
+          null
+        )
       Optional.of(new SessionUser(user))
     } catch {
       case e: Exception =>
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserRoleAuthorizer.scala b/amber/src/main/scala/org/apache/texera/web/auth/UserRoleAuthorizer.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserRoleAuthorizer.scala
rename to amber/src/main/scala/org/apache/texera/web/auth/UserRoleAuthorizer.scala
index 8cc160c2142..f966caa8fe3 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserRoleAuthorizer.scala
+++ b/amber/src/main/scala/org/apache/texera/web/auth/UserRoleAuthorizer.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.auth
+package org.apache.texera.web.auth
 
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
 import io.dropwizard.auth.Authorizer
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
 
 object UserRoleAuthorizer extends Authorizer[SessionUser] {
   override def authorize(user: SessionUser, role: String): Boolean = {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/CollabWebSocketEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/CollabWebSocketEvent.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/CollabWebSocketEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/CollabWebSocketEvent.scala
index 6ef19807e85..afc3a2df9fb 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/CollabWebSocketEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/CollabWebSocketEvent.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
-import edu.uci.ics.texera.web.model.collab.response.HeartBeatResponse
+import org.apache.texera.web.model.collab.response.HeartBeatResponse
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes(
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/CommandEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/CommandEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/CommandEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/CommandEvent.scala
index a76685343e6..d42aa3e0819 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/CommandEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/CommandEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 case class CommandEvent(commandMessage: String) extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/LockGrantedEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/LockGrantedEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/LockGrantedEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/LockGrantedEvent.scala
index 7688086d690..73930ba086b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/LockGrantedEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/LockGrantedEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 case class LockGrantedEvent() extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/LockRejectedEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/LockRejectedEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/LockRejectedEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/LockRejectedEvent.scala
index 35d03d4d288..227a1866404 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/LockRejectedEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/LockRejectedEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 case class LockRejectedEvent() extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/ReleaseLockEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/ReleaseLockEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/ReleaseLockEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/ReleaseLockEvent.scala
index a3f698d6e97..f7e4975013a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/ReleaseLockEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/ReleaseLockEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 case class ReleaseLockEvent() extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/RestoreVersionEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/RestoreVersionEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/RestoreVersionEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/RestoreVersionEvent.scala
index 0570e8a4cf9..2e2dec5db83 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/RestoreVersionEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/RestoreVersionEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 case class RestoreVersionEvent() extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/WorkflowAccessEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/event/WorkflowAccessEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/WorkflowAccessEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/event/WorkflowAccessEvent.scala
index 1e0276d946b..5b4523337af 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/event/WorkflowAccessEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/event/WorkflowAccessEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.event
+package org.apache.texera.web.model.collab.event
 
 case class WorkflowAccessEvent(workflowReadonly: Boolean) extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/AcquireLockRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/AcquireLockRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/AcquireLockRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/AcquireLockRequest.scala
index 45901b261f9..2bea78f53d2 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/AcquireLockRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/AcquireLockRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 case class AcquireLockRequest() extends CollabWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/CollabWebSocketRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/CollabWebSocketRequest.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/CollabWebSocketRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/CollabWebSocketRequest.scala
index 6f820fb4f32..f8f1de5220c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/CollabWebSocketRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/CollabWebSocketRequest.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/CommandRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/CommandRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/CommandRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/CommandRequest.scala
index 28cd15414cc..798d38d4107 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/CommandRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/CommandRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 case class CommandRequest(commandMessage: String) extends CollabWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/HeartBeatRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/HeartBeatRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/HeartBeatRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/HeartBeatRequest.scala
index d5daeca72c3..ffeb81df76c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/HeartBeatRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/HeartBeatRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 case class HeartBeatRequest() extends CollabWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/RestoreVersionRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/RestoreVersionRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/RestoreVersionRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/RestoreVersionRequest.scala
index 81812a7fa59..ce05116a3c4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/RestoreVersionRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/RestoreVersionRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 case class RestoreVersionRequest() extends CollabWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/TryLockRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/TryLockRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/TryLockRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/TryLockRequest.scala
index 855de50ed8e..05c35ad2455 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/TryLockRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/TryLockRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 case class TryLockRequest() extends CollabWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/WIdRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/request/WIdRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/WIdRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/request/WIdRequest.scala
index 82a23e9cfde..c90912b6ecc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/request/WIdRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/request/WIdRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.request
+package org.apache.texera.web.model.collab.request
 
 case class WIdRequest(wId: Int) extends CollabWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/response/HeartBeatResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/collab/response/HeartBeatResponse.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/response/HeartBeatResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/collab/response/HeartBeatResponse.scala
index 42eec296631..a0b20fbe517 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/collab/response/HeartBeatResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/collab/response/HeartBeatResponse.scala
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.collab.response
+package org.apache.texera.web.model.collab.response
 
-import edu.uci.ics.texera.web.model.collab.event.CollabWebSocketEvent
+import org.apache.texera.web.model.collab.event.CollabWebSocketEvent
 
 case class HeartBeatResponse() extends CollabWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/common/AccessEntry.scala b/amber/src/main/scala/org/apache/texera/web/model/common/AccessEntry.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/common/AccessEntry.scala
rename to amber/src/main/scala/org/apache/texera/web/model/common/AccessEntry.scala
index e8cb2d3ac0d..4cfacfbc84b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/common/AccessEntry.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/common/AccessEntry.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.common
+package org.apache.texera.web.model.common
 
 import org.jooq.EnumType
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/auth/UserLoginRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/http/request/auth/UserLoginRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/auth/UserLoginRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/http/request/auth/UserLoginRequest.scala
index 76619cef930..a034c45cfaf 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/auth/UserLoginRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/http/request/auth/UserLoginRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.http.request.auth
+package org.apache.texera.web.model.http.request.auth
 
 case class UserLoginRequest(username: String, password: String)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/auth/UserRegistrationRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/http/request/auth/UserRegistrationRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/auth/UserRegistrationRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/http/request/auth/UserRegistrationRequest.scala
index 91b124ec869..f28b27c87dd 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/auth/UserRegistrationRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/http/request/auth/UserRegistrationRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.http.request.auth
+package org.apache.texera.web.model.http.request.auth
 
 case class UserRegistrationRequest(username: String, password: String)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/http/request/result/ResultExportRequest.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/http/request/result/ResultExportRequest.scala
index 8190cbe7e10..56728a36762 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/http/request/result/ResultExportRequest.scala
@@ -17,13 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.http.request.result
+package org.apache.texera.web.model.http.request.result
+
+import play.api.libs.json._
 
 case class OperatorExportInfo(
     id: String,
     outputType: String
 )
 
+object OperatorExportInfo {
+  implicit val fmt: OFormat[OperatorExportInfo] = Json.format[OperatorExportInfo]
+}
+
 case class ResultExportRequest(
     exportType: String, // e.g. "csv", "google_sheet", "arrow", "data"
     workflowId: Int,
@@ -33,7 +39,10 @@ case class ResultExportRequest(
     rowIndex: Int, // used by "data" export
     columnIndex: Int, // used by "data" export
     filename: String, // optional filename override
-    destination: String, // "dataset" or "local"
     // TODO: remove it once the lifecycle of result and compute are unbundled
     computingUnitId: Int // the id of the computing unit
 )
+
+object ResultExportRequest {
+  implicit val fmt: OFormat[ResultExportRequest] = Json.format[ResultExportRequest]
+}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala
index 7474a44e070..7cdee2cc814 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.http.response
+package org.apache.texera.web.model.http.response
 
-import edu.uci.ics.amber.core.tuple.Attribute
+import org.apache.texera.amber.core.tuple.Attribute
 
 case class SchemaPropagationResponse(
     code: Int,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/TokenIssueResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/http/response/TokenIssueResponse.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/TokenIssueResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/http/response/TokenIssueResponse.scala
index bf015ecbc15..11c894e0131 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/TokenIssueResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/http/response/TokenIssueResponse.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.http.response
+package org.apache.texera.web.model.http.response
 
 case class TokenIssueResponse(accessToken: String)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/result/ResultExportResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/http/response/result/ResultExportResponse.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/result/ResultExportResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/http/response/result/ResultExportResponse.scala
index 6f8698fa4fc..53b4372bce9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/result/ResultExportResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/http/response/result/ResultExportResponse.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.http.response.result
+package org.apache.texera.web.model.http.response.result
 
 case class ResultExportResponse(status: String, message: String)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/CacheStatusUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/CacheStatusUpdateEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/CacheStatusUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/CacheStatusUpdateEvent.scala
index efe7c91194e..cd1c3448bc0 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/CacheStatusUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/CacheStatusUpdateEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 case class CacheStatusUpdateEvent(cacheStatusMap: Map[String, String]) extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/ExecutionDurationUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/ExecutionDurationUpdateEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/ExecutionDurationUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/ExecutionDurationUpdateEvent.scala
index 40c8e9c8300..8c5f9c368a5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/ExecutionDurationUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/ExecutionDurationUpdateEvent.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 case class ExecutionDurationUpdateEvent(duration: Long, isRunning: Boolean)
     extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/ExecutionStatusEnum.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/ExecutionStatusEnum.scala
similarity index 100%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/ExecutionStatusEnum.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/ExecutionStatusEnum.scala
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/OperatorStatisticsUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/OperatorStatisticsUpdateEvent.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/OperatorStatisticsUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/OperatorStatisticsUpdateEvent.scala
index b33b6f93e15..d4aa6117c91 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/OperatorStatisticsUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/OperatorStatisticsUpdateEvent.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 case class OperatorAggregatedMetrics(
     operatorState: String,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/PaginatedResultEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/PaginatedResultEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala
index 68adfd78af7..081d072180b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/PaginatedResultEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 import com.fasterxml.jackson.databind.node.ObjectNode
-import edu.uci.ics.amber.core.tuple.Attribute
-import edu.uci.ics.texera.web.model.websocket.request.ResultPaginationRequest
+import org.apache.texera.amber.core.tuple.Attribute
+import org.apache.texera.web.model.websocket.request.ResultPaginationRequest
 
 object PaginatedResultEvent {
   def apply(
diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/RegionStateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/RegionStateEvent.scala
new file mode 100644
index 00000000000..2e16ba9243e
--- /dev/null
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/RegionStateEvent.scala
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.web.model.websocket.event
+
+case class RegionStateEvent(id: Long, state: String) extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/TexeraWebSocketEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/TexeraWebSocketEvent.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/TexeraWebSocketEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/TexeraWebSocketEvent.scala
index d6df04e902e..da072c80ea5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/TexeraWebSocketEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/TexeraWebSocketEvent.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
-import edu.uci.ics.texera.web.model.websocket.event.python.ConsoleUpdateEvent
-import edu.uci.ics.texera.web.model.websocket.response.python.PythonExpressionEvaluateResponse
-import edu.uci.ics.texera.web.model.websocket.response.{HeartBeatResponse, ModifyLogicResponse}
+import org.apache.texera.web.model.websocket.event.python.ConsoleUpdateEvent
+import org.apache.texera.web.model.websocket.response.python.PythonExpressionEvaluateResponse
+import org.apache.texera.web.model.websocket.response.{HeartBeatResponse, ModifyLogicResponse}
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes(
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WebResultUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WebResultUpdateEvent.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WebResultUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/WebResultUpdateEvent.scala
index b5d4aab7130..5689eaafbc0 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WebResultUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WebResultUpdateEvent.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
-import edu.uci.ics.texera.web.service.ExecutionResultService.WebResultUpdate
+import org.apache.texera.web.service.ExecutionResultService.WebResultUpdate
 
 case class WebResultUpdateEvent(
     updates: Map[String, WebResultUpdate],
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkerAssignmentUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkerAssignmentUpdateEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkerAssignmentUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkerAssignmentUpdateEvent.scala
index b5acc0d8dae..0b3bce71f88 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkerAssignmentUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkerAssignmentUpdateEvent.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 case class WorkerAssignmentUpdateEvent(operatorId: String, workerIds: Seq[String])
     extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowAvailableResultEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowAvailableResultEvent.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowAvailableResultEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowAvailableResultEvent.scala
index 362a1e3e781..bc9e006cd39 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowAvailableResultEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowAvailableResultEvent.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
-import edu.uci.ics.texera.web.model.websocket.event.WorkflowAvailableResultEvent.OperatorAvailableResult
-import edu.uci.ics.texera.web.service.ExecutionResultService.WebOutputMode
+import org.apache.texera.web.model.websocket.event.WorkflowAvailableResultEvent.OperatorAvailableResult
+import org.apache.texera.web.service.ExecutionResultService.WebOutputMode
 
 object WorkflowAvailableResultEvent {
   case class OperatorAvailableResult(
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala
index d7b0fbf947c..5169a1f759e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
 
 case class WorkflowErrorEvent(
     fatalErrors: Seq[WorkflowFatalError]
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowStateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowStateEvent.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowStateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowStateEvent.scala
index 604d7a2c60b..3bad65234fe 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowStateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowStateEvent.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event
+package org.apache.texera.web.model.websocket.event
 
 case class WorkflowStateEvent(state: String) extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala
index c01bb4c29d0..4ec4732e358 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.event.python
+package org.apache.texera.web.model.websocket.event.python
 
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessage
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessage
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
 
 object ConsoleUpdateEvent {}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala
index f3cbb4203f7..e15b441fcae 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.texera.workflow.LogicalLink
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.workflow.LogicalLink
 
 case class EditingTimeCompilationRequest(
     operators: List[LogicalOp],
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/HeartBeatRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/HeartBeatRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/HeartBeatRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/HeartBeatRequest.scala
index 17a8c2edfb5..712aa98773d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/HeartBeatRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/HeartBeatRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class HeartBeatRequest() extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/ModifyLogicRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/ModifyLogicRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala
index 00dcd160606..84ae56eecc6 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/ModifyLogicRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
-import edu.uci.ics.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.LogicalOp
 
 case class ModifyLogicRequest(operator: LogicalOp) extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/ResultPaginationRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ResultPaginationRequest.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/ResultPaginationRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/ResultPaginationRequest.scala
index 8134daee13b..4a3e0a58a3e 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/ResultPaginationRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ResultPaginationRequest.scala
@@ -17,11 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class ResultPaginationRequest(
     requestID: String,
     operatorID: String,
     pageIndex: Int,
-    pageSize: Int
+    pageSize: Int,
+    columnOffset: Int = 0,
+    columnLimit: Int = Int.MaxValue,
+    columnSearch: Option[String] = None
 ) extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/RetryRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/RetryRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/RetryRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/RetryRequest.scala
index a28f0298058..6a0bfba0391 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/RetryRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/RetryRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class RetryRequest(workers: Seq[String]) extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/SkipTupleRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/SkipTupleRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/SkipTupleRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/SkipTupleRequest.scala
index 7d4b75f6d54..11f9a3e63f2 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/SkipTupleRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/SkipTupleRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class SkipTupleRequest(workerIds: Array[String]) extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/TexeraWebSocketRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/TexeraWebSocketRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/TexeraWebSocketRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/TexeraWebSocketRequest.scala
index 2b3c3ac44f1..1a92514ff90 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/TexeraWebSocketRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/TexeraWebSocketRequest.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
-import edu.uci.ics.texera.web.model.websocket.request.python.{
+import org.apache.texera.web.model.websocket.request.python.{
   DebugCommandRequest,
   PythonExpressionEvaluateRequest
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowCheckpointRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowCheckpointRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowCheckpointRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowCheckpointRequest.scala
index 3ea084629b4..79c82a25a40 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowCheckpointRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowCheckpointRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class WorkflowCheckpointRequest() extends TexeraWebSocketRequest()
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala
index a8f9e470451..a346a1ec0a4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import edu.uci.ics.amber.core.workflow.WorkflowSettings
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.texera.workflow.LogicalLink
+import org.apache.texera.amber.core.workflow.WorkflowSettings
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.workflow.LogicalLink
 
 case class ReplayExecutionInfo(
     @JsonDeserialize(contentAs = classOf[java.lang.Long])
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowKillRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowKillRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowKillRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowKillRequest.scala
index 986c07eefb6..da5adfe2942 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowKillRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowKillRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class WorkflowKillRequest() extends TexeraWebSocketRequest()
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowPauseRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowPauseRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowPauseRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowPauseRequest.scala
index 24b6f8b534a..0eb23d6b21c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowPauseRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowPauseRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class WorkflowPauseRequest() extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowResumeRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowResumeRequest.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowResumeRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowResumeRequest.scala
index 0e6862f72ca..669202616ed 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowResumeRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowResumeRequest.scala
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request
+package org.apache.texera.web.model.websocket.request
 
 case class WorkflowResumeRequest() extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/python/DebugCommandRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/python/DebugCommandRequest.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/python/DebugCommandRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/python/DebugCommandRequest.scala
index a977a75fd09..20dccf6f788 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/python/DebugCommandRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/python/DebugCommandRequest.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request.python
+package org.apache.texera.web.model.websocket.request.python
 
-import edu.uci.ics.texera.web.model.websocket.request.TexeraWebSocketRequest
+import org.apache.texera.web.model.websocket.request.TexeraWebSocketRequest
 
 case class DebugCommandRequest(operatorId: String, workerId: String, cmd: String)
     extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/python/PythonExpressionEvaluateRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/python/PythonExpressionEvaluateRequest.scala
similarity index 86%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/python/PythonExpressionEvaluateRequest.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/request/python/PythonExpressionEvaluateRequest.scala
index 030e417f578..11086448c3c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/python/PythonExpressionEvaluateRequest.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/python/PythonExpressionEvaluateRequest.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.request.python
+package org.apache.texera.web.model.websocket.request.python
 
-import edu.uci.ics.texera.web.model.websocket.request.TexeraWebSocketRequest
+import org.apache.texera.web.model.websocket.request.TexeraWebSocketRequest
 
 case class PythonExpressionEvaluateRequest(expression: String, operatorId: String)
     extends TexeraWebSocketRequest
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/ClusterStatusUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/ClusterStatusUpdateEvent.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/ClusterStatusUpdateEvent.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/response/ClusterStatusUpdateEvent.scala
index 1e23a4b6227..5e6b187e9cf 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/ClusterStatusUpdateEvent.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/ClusterStatusUpdateEvent.scala
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.response
+package org.apache.texera.web.model.websocket.response
 
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
 
 case class ClusterStatusUpdateEvent(numWorkers: Int) extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/HeartBeatResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/HeartBeatResponse.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/HeartBeatResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/response/HeartBeatResponse.scala
index 6e67621121f..bf4beca397c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/HeartBeatResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/HeartBeatResponse.scala
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.response
+package org.apache.texera.web.model.websocket.response
 
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
 
 case class HeartBeatResponse() extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/ModifyLogicResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/ModifyLogicResponse.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/ModifyLogicResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/response/ModifyLogicResponse.scala
index 39757c88d88..d2270cfeff1 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/ModifyLogicResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/ModifyLogicResponse.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.response
+package org.apache.texera.web.model.websocket.response
 
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
 
 case class ModifyLogicResponse(
     opId: String,
diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/response/RegionUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/RegionUpdateEvent.scala
new file mode 100644
index 00000000000..9578b28b46d
--- /dev/null
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/RegionUpdateEvent.scala
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.web.model.websocket.response
+
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
+
+case class RegionUpdateEvent(regions: List[(Long, List[String])]) extends TexeraWebSocketEvent
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala
rename to amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala
index c8ceec40a6d..f4f4a77ab4a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala
+++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.model.websocket.response.python
+package org.apache.texera.web.model.websocket.response.python
 
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EvaluatedValue
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EvaluatedValue
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
 
 case class PythonExpressionEvaluateResponse(
     expression: String,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala
index b7e3204ea34..4ac0e8769c9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.util.JSONUtils
-import edu.uci.ics.texera.web.ServletAwareConfigurator
-import edu.uci.ics.texera.web.model.collab.event._
-import edu.uci.ics.texera.web.model.collab.request._
-import edu.uci.ics.texera.web.model.collab.response.HeartBeatResponse
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.resource.CollaborationResource._
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource
+import org.apache.texera.amber.util.JSONUtils
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.ServletAwareConfigurator
+import org.apache.texera.web.model.collab.event._
+import org.apache.texera.web.model.collab.request._
+import org.apache.texera.web.model.collab.response.HeartBeatResponse
+import org.apache.texera.web.resource.CollaborationResource._
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource
 
 import javax.websocket.server.ServerEndpoint
 import javax.websocket.{OnClose, OnMessage, OnOpen, Session}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/EmailTemplate.scala b/amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/EmailTemplate.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala
index 2879c8fc718..1ad3c57af7a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/EmailTemplate.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/EmailTemplate.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.config.UserSystemConfig
+import org.apache.texera.config.UserSystemConfig
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
 
 /**
   * EmailTemplate provides factory methods to generate email messages
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GmailResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GmailResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
index 649c611b1ca..6ab5b7bcce4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GmailResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
-
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.UserDao
-import edu.uci.ics.texera.web.resource.EmailTemplate.userRegistrationNotification
-import edu.uci.ics.texera.web.resource.GmailResource.{isValidEmail, sendEmail, senderGmail, userDao}
+package org.apache.texera.web.resource
+
 import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.config.UserSystemConfig
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
+import org.apache.texera.web.resource.EmailTemplate.userRegistrationNotification
+import org.apache.texera.web.resource.GmailResource.{isValidEmail, sendEmail, senderGmail, userDao}
 import org.slf4j.LoggerFactory
 
 import javax.annotation.security.RolesAllowed
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/HealthCheckResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/HealthCheckResource.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/HealthCheckResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/HealthCheckResource.scala
index 6c7c38c4cb7..0a182ecd4c8 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/HealthCheckResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/HealthCheckResource.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
 import javax.ws.rs.core.MediaType
 import javax.ws.rs.{GET, Path, Produces}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/MockKillWorkerResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/MockKillWorkerResource.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/MockKillWorkerResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/MockKillWorkerResource.scala
index 67290b48f35..d51556f53e8 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/MockKillWorkerResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/MockKillWorkerResource.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-//package edu.uci.ics.texera.web.resource
+//package org.apache.texera.web.resource
 //
 //import .KillAndRecover
 //import javax.ws.rs.core.MediaType
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SuccessExecutionResult.scala b/amber/src/main/scala/org/apache/texera/web/resource/SuccessExecutionResult.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SuccessExecutionResult.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/SuccessExecutionResult.scala
index 7eaf23d45e1..2318d054cab 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SuccessExecutionResult.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/SuccessExecutionResult.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
 case class SuccessExecutionResult(
     resultID: String,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SystemMetadataResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SystemMetadataResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala
index 04032e0315d..a17cb736a8c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SystemMetadataResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
-import edu.uci.ics.amber.operator.metadata.{AllOperatorMetadata, OperatorMetadataGenerator}
+import org.apache.texera.amber.operator.metadata.{AllOperatorMetadata, OperatorMetadataGenerator}
 
 import javax.ws.rs.core.MediaType
 import javax.ws.rs.{GET, Path, Produces}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/UserConfigResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/UserConfigResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
index 78680512387..2bf5a7d26ae 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/UserConfigResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.Tables.USER_CONFIG
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.UserConfigDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{User, UserConfig}
-import edu.uci.ics.texera.auth.SessionUser
 import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables.USER_CONFIG
+import org.apache.texera.dao.jooq.generated.tables.daos.UserConfigDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.{User, UserConfig}
 
 import javax.annotation.security.RolesAllowed
 import javax.ws.rs._
@@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.CollectionHasAsScala
   * This class handles requests to read and write the user dictionary,
   * an abstract collection of (key, value) string pairs that is unique for each user
   * This is accomplished using a mysql table called user_dictionary.
-  * The details of user_dictionary can be found in /core/scripts/sql/texera_ddl.sql
+  * The details of user_dictionary can be found in /sql/texera_ddl.sql
   */
 @Path("/user/config")
 @RolesAllowed(Array("REGULAR", "ADMIN"))
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WebsocketPayloadSizeTuner.scala b/amber/src/main/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTuner.scala
similarity index 97%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WebsocketPayloadSizeTuner.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTuner.scala
index 9b6e624881d..92c7ad87f00 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WebsocketPayloadSizeTuner.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/WebsocketPayloadSizeTuner.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
-import javax.websocket.server.ServerContainer
 import javax.servlet.{ServletContextEvent, ServletContextListener}
+import javax.websocket.server.ServerContainer
 
 class WebsocketPayloadSizeTuner(maxKB: Int) // by default, 64 KiB
     extends ServletContextListener {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala
similarity index 76%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala
index 1cf90241e92..3a02a9a4c21 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala
@@ -17,22 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
 import com.google.protobuf.timestamp.Timestamp
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.clustering.ClusterListener
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses
-import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity
-import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.model.websocket.event.{WorkflowErrorEvent, WorkflowStateEvent}
-import edu.uci.ics.texera.web.model.websocket.request._
-import edu.uci.ics.texera.web.model.websocket.response._
-import edu.uci.ics.texera.web.service.WorkflowService
-import edu.uci.ics.texera.web.{ServletAwareConfigurator, SessionState}
+import org.apache.texera.amber.clustering.ClusterListener
+import org.apache.texera.amber.core.virtualidentity.WorkflowIdentity
+import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.error.ErrorUtils.getStackTraceWithAllCauses
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.auth.util.HeaderField
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.model.websocket.event.{WorkflowErrorEvent, WorkflowStateEvent}
+import org.apache.texera.web.model.websocket.request._
+import org.apache.texera.web.model.websocket.response._
+import org.apache.texera.web.service.WorkflowService
+import org.apache.texera.web.{ServletAwareConfigurator, SessionState}
 
 import java.time.Instant
 import javax.websocket._
@@ -51,13 +53,22 @@ class WorkflowWebsocketResource extends LazyLogging {
     SessionState.setState(session.getId, sessionState)
     val wid = session.getRequestParameterMap.get("wid").get(0).toLong
     val cuid = session.getRequestParameterMap.get("cuid").get(0).toInt
+    val cuAccessEnum: PrivilegeEnum = PrivilegeEnum.valueOf(
+      session.getUserProperties
+        .get(HeaderField.UserComputingUnitAccess)
+        .asInstanceOf[String]
+    )
+
+    sessionState.setUserComputingUnitAccess(cuAccessEnum)
+    logger.info(
+      s"Websocket connection opened for workflow $wid with computing unit $cuid and access $cuAccessEnum"
+    )
     // hack to refresh frontend run button state
     sessionState.send(WorkflowStateEvent("Uninitialized"))
     val workflowState =
       WorkflowService.getOrCreate(WorkflowIdentity(wid), cuid)
     sessionState.subscribe(workflowState)
     sessionState.send(ClusterStatusUpdateEvent(ClusterListener.numWorkerNodesInCluster))
-    logger.info("connection open")
   }
 
   @OnClose
@@ -94,6 +105,9 @@ class WorkflowWebsocketResource extends LazyLogging {
             sessionState.send(modifyLogicResponse)
           }
         case workflowExecuteRequest: WorkflowExecuteRequest =>
+          if (sessionState.getUserComputingUnitAccess != PrivilegeEnum.WRITE) {
+            throw new IllegalStateException("User does not have write access to the computing unit")
+          }
           workflowStateOpt match {
             case Some(workflow) =>
               sessionState.send(WorkflowStateEvent("Initializing"))
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/AiAssistantManager.scala b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/AiAssistantManager.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala
index 7b18cd879ea..374525ff3ff 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/AiAssistantManager.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.aiassistant
+package org.apache.texera.web.resource.aiassistant
 
 import com.typesafe.config.Config
-import edu.uci.ics.amber.config.ApplicationConfig
+import org.apache.texera.amber.config.ApplicationConfig
 
 import java.net.{HttpURLConnection, URL}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/AiAssistantResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantResource.scala
similarity index 98%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/AiAssistantResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantResource.scala
index 5071c8e6f41..3da8de87e81 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/AiAssistantResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantResource.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource
+package org.apache.texera.web.resource
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.web.resource.aiassistant.AiAssistantManager
 import io.dropwizard.auth.Auth
 import kong.unirest.Unirest
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.web.resource.aiassistant.AiAssistantManager
 import play.api.libs.json._
 
 import java.nio.file.Paths
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/test_type_annotation_visitor.py b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/test_type_annotation_visitor.py
similarity index 100%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/test_type_annotation_visitor.py
rename to amber/src/main/scala/org/apache/texera/web/resource/aiassistant/test_type_annotation_visitor.py
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/type_annotation_visitor.py b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/type_annotation_visitor.py
similarity index 100%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/aiassistant/type_annotation_visitor.py
rename to amber/src/main/scala/org/apache/texera/web/resource/aiassistant/type_annotation_visitor.py
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/AuthResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/AuthResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
index ccccdd768ac..76544ae8ff6 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/AuthResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.auth
+package org.apache.texera.web.resource.auth
 
-import edu.uci.ics.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken}
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.web.model.http.request.auth.{UserLoginRequest, UserRegistrationRequest}
-import edu.uci.ics.texera.web.model.http.response.TokenIssueResponse
-import edu.uci.ics.texera.dao.jooq.generated.Tables.USER
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.UserDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.resource.auth.AuthResource._
+import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken}
+import org.apache.texera.config.UserSystemConfig
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables.USER
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.model.http.request.auth.{UserLoginRequest, UserRegistrationRequest}
+import org.apache.texera.web.model.http.response.TokenIssueResponse
+import org.apache.texera.web.resource.auth.AuthResource._
 import org.jasypt.util.password.StrongPasswordEncryptor
 
 import javax.ws.rs._
@@ -89,8 +89,6 @@ class AuthResource {
   @POST
   @Path("/login")
   def login(request: UserLoginRequest): TokenIssueResponse = {
-    if (!UserSystemConfig.isUserSystemEnabled)
-      throw new NotAcceptableException("User System is disabled on the backend!")
     retrieveUserByUsernameAndPassword(request.username, request.password) match {
       case Some(user) =>
         TokenIssueResponse(jwtToken(jwtClaims(user, TOKEN_EXPIRE_TIME_IN_MINUTES)))
@@ -101,8 +99,6 @@ class AuthResource {
   @POST
   @Path("/register")
   def register(request: UserRegistrationRequest): TokenIssueResponse = {
-    if (!UserSystemConfig.isUserSystemEnabled)
-      throw new NotAcceptableException("User System is disabled on the backend!")
     val username = request.username
     if (username == null) throw new NotAcceptableException("Username cannot be null.")
     if (username.trim.isEmpty) throw new NotAcceptableException("Username cannot be empty.")
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/GoogleAuthResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
similarity index 84%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/GoogleAuthResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
index d49d4d41a59..5b91583222f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/GoogleAuthResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.auth
+package org.apache.texera.web.resource.auth
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier
 import com.google.api.client.http.javanet.NetHttpTransport
 import com.google.api.client.json.gson.GsonFactory
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken}
-import edu.uci.ics.texera.web.model.http.response.TokenIssueResponse
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.UserDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.resource.auth.GoogleAuthResource.userDao
+import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken}
+import org.apache.texera.config.UserSystemConfig
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.model.http.response.TokenIssueResponse
+import org.apache.texera.web.resource.auth.GoogleAuthResource.userDao
 
 import java.util.Collections
 import javax.ws.rs._
@@ -57,8 +57,6 @@ class GoogleAuthResource {
   @Produces(Array(MediaType.APPLICATION_JSON))
   @Path("/login")
   def login(credential: String): TokenIssueResponse = {
-    if (!UserSystemConfig.isUserSystemEnabled)
-      throw new NotAcceptableException("User System is disabled on the backend!")
     val idToken =
       new GoogleIdTokenVerifier.Builder(new NetHttpTransport, GsonFactory.getDefaultInstance)
         .setAudience(
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DashboardResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DashboardResource.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DashboardResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/DashboardResource.scala
index 92341df0afa..704219fc2d3 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DashboardResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DashboardResource.scala
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
-
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos._
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource._
-import edu.uci.ics.texera.web.resource.dashboard.SearchQueryBuilder.{ALL_RESOURCE_TYPE, context}
-import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.DashboardDataset
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource.DashboardWorkflow
-import io.dropwizard.auth.Auth
+package org.apache.texera.web.resource.dashboard
 
+import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.tables.pojos._
+import org.apache.texera.web.resource.dashboard.DashboardResource._
+import org.apache.texera.web.resource.dashboard.SearchQueryBuilder.{ALL_RESOURCE_TYPE, context}
+import org.apache.texera.web.resource.dashboard.user.dataset.DatasetResource.DashboardDataset
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource.DashboardWorkflow
 import org.jooq.{Field, OrderField}
 
 import java.util
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala
index 469cfbe5eb2..89fe805d58c 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala
@@ -17,23 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
+package org.apache.texera.web.resource.dashboard
 
-import edu.uci.ics.amber.core.storage.util.LakeFSStorageClient
-import edu.uci.ics.texera.dao.jooq.generated.Tables.{DATASET, DATASET_USER_ACCESS}
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.User.USER
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Dataset, User}
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
-import edu.uci.ics.texera.web.resource.dashboard.FulltextSearchQueryUtils.{
+import com.typesafe.scalalogging.LazyLogging
+import org.apache.texera.amber.core.storage.util.LakeFSStorageClient
+import org.apache.texera.dao.jooq.generated.Tables.{DATASET, DATASET_USER_ACCESS}
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.User.USER
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Dataset, User}
+import org.apache.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
+import org.apache.texera.web.resource.dashboard.FulltextSearchQueryUtils.{
   getContainsFilter,
   getDateFilter,
   getFullTextSearchFilter
 }
-import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.DashboardDataset
+import org.apache.texera.web.resource.dashboard.user.dataset.DatasetResource.DashboardDataset
 import org.jooq.impl.DSL
 import org.jooq.{Condition, GroupField, Record, TableLike}
-import com.typesafe.scalalogging.LazyLogging
+
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 
 object DatasetSearchQueryBuilder extends SearchQueryBuilder with LazyLogging {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/FulltextSearchQueryUtils.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/FulltextSearchQueryUtils.scala
similarity index 99%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/FulltextSearchQueryUtils.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/FulltextSearchQueryUtils.scala
index 178cdd9c76a..2901b28fe0b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/FulltextSearchQueryUtils.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/FulltextSearchQueryUtils.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
+package org.apache.texera.web.resource.dashboard
 
 import org.jooq.impl.DSL.{condition, noCondition}
 import org.jooq.{Condition, Field}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/ProjectSearchQueryBuilder.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/ProjectSearchQueryBuilder.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/ProjectSearchQueryBuilder.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/ProjectSearchQueryBuilder.scala
index a03a82c0445..5e247f87172 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/ProjectSearchQueryBuilder.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/ProjectSearchQueryBuilder.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
+package org.apache.texera.web.resource.dashboard
 
-import edu.uci.ics.texera.dao.jooq.generated.Tables.{PROJECT, PROJECT_USER_ACCESS}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.Project
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
-import edu.uci.ics.texera.web.resource.dashboard.FulltextSearchQueryUtils.{
+import org.apache.texera.dao.jooq.generated.Tables.{PROJECT, PROJECT_USER_ACCESS}
+import org.apache.texera.dao.jooq.generated.tables.pojos.Project
+import org.apache.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
+import org.apache.texera.web.resource.dashboard.FulltextSearchQueryUtils.{
   getContainsFilter,
   getDateFilter,
   getFullTextSearchFilter
 }
 import org.jooq.impl.DSL
-
 import org.jooq.{Condition, GroupField, Record, TableLike}
 
 import scala.jdk.CollectionConverters.CollectionHasAsScala
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/SearchQueryBuilder.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/SearchQueryBuilder.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
index 014d29e0e70..e762f1715c4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/SearchQueryBuilder.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
+package org.apache.texera.web.resource.dashboard
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.{
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.web.resource.dashboard.DashboardResource.{
   DashboardClickableFileEntry,
   SearchQueryParams
 }
-import edu.uci.ics.texera.web.resource.dashboard.SearchQueryBuilder.context
+import org.apache.texera.web.resource.dashboard.SearchQueryBuilder.context
 import org.jooq._
 
 object SearchQueryBuilder {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/UnifiedResourceSchema.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/UnifiedResourceSchema.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
index 09fdacc55ff..785640808f7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/UnifiedResourceSchema.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
+package org.apache.texera.web.resource.dashboard
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.web.resource.dashboard.UnifiedResourceSchema.context
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.web.resource.dashboard.UnifiedResourceSchema.context
 import org.jooq.impl.DSL
 import org.jooq.{Field, Record}
 
@@ -102,7 +102,7 @@ object UnifiedResourceSchema {
 }
 
 /**
-  * Refer to texera/core/scripts/sql/texera_ddl.sql to understand what each attribute is
+  * Refer to /sql/texera_ddl.sql to understand what each attribute is
   *
   * Attributes common across all resource types:
   * - `resourceType`: The type of the resource (e.g., project, workflow, file) as a `String`.
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala
index 3ebead011db..cfa653316d2 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard
+package org.apache.texera.web.resource.dashboard
 
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.Workflow
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
-import edu.uci.ics.texera.web.resource.dashboard.FulltextSearchQueryUtils._
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource.DashboardWorkflow
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.tables.pojos.Workflow
+import org.apache.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
+import org.apache.texera.web.resource.dashboard.FulltextSearchQueryUtils._
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource.DashboardWorkflow
 import org.jooq.impl.DSL
 import org.jooq.impl.DSL.groupConcatDistinct
 import org.jooq.{Condition, GroupField, Record, TableLike}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
index a39e54d94a1..a5377187354 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.admin.execution
+package org.apache.texera.web.resource.dashboard.admin.execution
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.web.resource.dashboard.admin.execution.AdminExecutionResource._
 import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.web.resource.dashboard.admin.execution.AdminExecutionResource._
 import org.jooq.impl.DSL
 
 import javax.annotation.security.RolesAllowed
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
index 9d58edd1f7a..1c42be759d5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
@@ -17,17 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.admin.settings
+package org.apache.texera.web.resource.dashboard.admin.settings
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.config.DefaultsConfig
+import org.apache.texera.dao.SqlServer
+import org.jooq.impl.DSL
 
 import javax.annotation.security.RolesAllowed
 import javax.ws.rs._
 import javax.ws.rs.core.{MediaType, Response}
-import io.dropwizard.auth.Auth
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.config.DefaultsConfig
-import org.jooq.impl.DSL
-import com.fasterxml.jackson.annotation.JsonProperty
 
 case class AdminSettingsPojo(
     @JsonProperty("key") settingKey: String,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/user/AdminUserResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
index 4d8cde9ca8f..7372ab6fc00 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.admin.user
+package org.apache.texera.web.resource.dashboard.admin.user
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.UserDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.resource.EmailTemplate.createRoleChangeTemplate
-import edu.uci.ics.texera.web.resource.GmailResource.sendEmail
-import edu.uci.ics.texera.web.resource.dashboard.admin.user.AdminUserResource.userDao
-import edu.uci.ics.texera.web.resource.dashboard.user.quota.UserQuotaResource._
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.User.USER
+import org.apache.texera.dao.jooq.generated.tables.UserLastActiveTime.USER_LAST_ACTIVE_TIME
+import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.resource.EmailTemplate.createRoleChangeTemplate
+import org.apache.texera.web.resource.GmailResource.sendEmail
+import org.apache.texera.web.resource.dashboard.admin.user.AdminUserResource.userDao
+import org.apache.texera.web.resource.dashboard.user.quota.UserQuotaResource._
 import org.jasypt.util.password.StrongPasswordEncryptor
-import edu.uci.ics.texera.dao.jooq.generated.tables.User.USER
-import edu.uci.ics.texera.dao.jooq.generated.tables.UserLastActiveTime.USER_LAST_ACTIVE_TIME
 
 import java.util
 import javax.annotation.security.RolesAllowed
@@ -45,7 +45,8 @@ case class UserInfo(
     googleAvatar: String,
     comment: String,
     lastLogin: java.time.OffsetDateTime, // will be null if never logged in
-    accountCreation: java.time.OffsetDateTime
+    accountCreation: java.time.OffsetDateTime,
+    affiliation: String
 )
 
 object AdminUserResource {
@@ -78,7 +79,8 @@ class AdminUserResource {
         USER.GOOGLE_AVATAR,
         USER.COMMENT,
         USER_LAST_ACTIVE_TIME.LAST_ACTIVE_TIME,
-        USER.ACCOUNT_CREATION_TIME
+        USER.ACCOUNT_CREATION_TIME,
+        USER.AFFILIATION
       )
       .from(USER)
       .leftJoin(USER_LAST_ACTIVE_TIME)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/ActionType.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/ActionType.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/ActionType.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/ActionType.scala
index bb8411b0495..ce82001faaa 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/ActionType.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/ActionType.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.hub
+package org.apache.texera.web.resource.dashboard.hub
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonValue}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/EntityTables.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/EntityTables.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/EntityTables.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/EntityTables.scala
index e6a8a8d813e..b152086d4f7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/EntityTables.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/EntityTables.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.hub
+package org.apache.texera.web.resource.dashboard.hub
 
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.tables.records._
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.tables.records._
 import org.jooq._
 
 object EntityTables {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/EntityType.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/EntityType.scala
similarity index 96%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/EntityType.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/EntityType.scala
index 0ef787716ba..0cf1bd4cc8d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/EntityType.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/EntityType.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.hub
+package org.apache.texera.web.resource.dashboard.hub
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonValue}
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/HubResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/HubResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
index 50634b14a9a..e4ecc769c16 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/hub/HubResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
@@ -17,50 +17,38 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.hub
-
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import HubResource.{
-  AccessResponse,
-  CountResponse,
-  LikedResponse,
-  UserRequest,
-  ViewRequest,
-  fetchDashboardDatasetsByDids,
-  fetchDashboardWorkflowsByWids,
-  isLikedHelper,
-  recordLikeAction,
-  recordUserAction
-}
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource.{
+package org.apache.texera.web.resource.dashboard.hub
+
+import io.dropwizard.auth.Auth
+import org.apache.texera.amber.core.storage.util.LakeFSStorageClient
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.enums.ActionEnum
+import org.apache.texera.dao.jooq.generated.tables.Dataset.DATASET
+import org.apache.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS
+import org.apache.texera.dao.jooq.generated.tables.User.USER
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Dataset, DatasetUserAccess}
+import org.apache.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
+import org.apache.texera.web.resource.dashboard.hub.ActionType.{Clone, Like, Unlike, View}
+import org.apache.texera.web.resource.dashboard.hub.EntityTables._
+import org.apache.texera.web.resource.dashboard.hub.HubResource._
+import org.apache.texera.web.resource.dashboard.user.dataset.DatasetResource.DashboardDataset
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource.{
   DashboardWorkflow,
   baseWorkflowSelect,
   mapWorkflowEntries
 }
+import org.jooq.Table
 import org.jooq.impl.DSL
 
 import java.util.regex.Pattern
 import javax.servlet.http.HttpServletRequest
 import javax.ws.rs._
 import javax.ws.rs.core.{Context, MediaType}
-import scala.language.existentials
-import scala.jdk.CollectionConverters._
-import EntityTables._
-import edu.uci.ics.amber.core.storage.util.LakeFSStorageClient
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.enums.ActionEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.Dataset.DATASET
-import edu.uci.ics.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS
-import edu.uci.ics.texera.dao.jooq.generated.tables.User.USER
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Dataset, DatasetUserAccess}
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.DashboardClickableFileEntry
-import edu.uci.ics.texera.web.resource.dashboard.hub.ActionType.{Clone, Like, Unlike, View}
-import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.DashboardDataset
-import io.dropwizard.auth.Auth
-import org.jooq.Table
-
 import scala.collection.mutable.ListBuffer
+import scala.jdk.CollectionConverters._
+import scala.language.existentials
 
 object HubResource {
   // Represents an entity reference for general-purpose batch APIs.
diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala
new file mode 100644
index 00000000000..eaafe7f3230
--- /dev/null
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.web.resource.dashboard.user
+
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
+import org.apache.texera.dao.jooq.generated.tables.User.USER
+import javax.ws.rs._
+import javax.ws.rs.core.{MediaType, Response}
+
+case class AffiliationUpdateRequest(uid: Int, affiliation: String)
+
+object UserResource {
+  private lazy val context = SqlServer.getInstance().createDSLContext()
+  private lazy val userDao = new UserDao(context.configuration)
+}
+
+@Path("/user")
+class UserResource {
+
+  /**
+    * Update the affiliation of a user.
+    * Used by a first-time user to set their own affiliation.
+    */
+  @PUT
+  @Path("/affiliation")
+  @Consumes(Array(MediaType.APPLICATION_JSON))
+  def updateAffiliation(request: AffiliationUpdateRequest): Unit = {
+    val rowsUpdated = UserResource.context
+      .update(USER)
+      .set(USER.AFFILIATION, request.affiliation)
+      .where(USER.UID.eq(request.uid))
+      .execute()
+
+    if (rowsUpdated == 0) {
+      throw new WebApplicationException("User not found", Response.Status.NOT_FOUND)
+    }
+  }
+
+  /**
+    * Gets affiliation with uid. Returns "", null or affiliation.
+    * "": Prompted and no response
+    * null: never prompted
+    * @param uid
+    * @return
+    */
+  @GET
+  @Path("/affiliation")
+  @Produces(Array(MediaType.APPLICATION_JSON))
+  def needsAffiliation(@QueryParam("uid") uid: Int): java.lang.Boolean = {
+    val user = UserResource.userDao.fetchOneByUid(uid)
+    if (user == null) {
+      throw new WebApplicationException("User not found", Response.Status.NOT_FOUND)
+    }
+    java.lang.Boolean.valueOf(user.getAffiliation == null)
+  }
+}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/DatasetResource.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/DatasetResource.scala
index 274a19e164b..80ec0b9001d 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/DatasetResource.scala
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.dataset
-
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.Dataset
+package org.apache.texera.web.resource.dashboard.user.dataset
 
+import org.apache.texera.dao.jooq.generated.tables.pojos.Dataset
 import org.jooq.EnumType
 
 object DatasetResource {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
index 5e6f548765f..de6f1adf96a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.dataset.utils
+package org.apache.texera.web.resource.dashboard.user.dataset.utils
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.tables.Dataset.DATASET
-import edu.uci.ics.texera.web.resource.dashboard.user.quota.UserQuotaResource.DatasetQuota
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.tables.Dataset.DATASET
+import org.apache.texera.web.resource.dashboard.user.quota.UserQuotaResource.DatasetQuota
 
 import scala.jdk.CollectionConverters._
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
similarity index 89%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
index c66eda2f0e5..d2673400ea7 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.project
+package org.apache.texera.web.resource.dashboard.user.project
 
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.web.model.common.AccessEntry
-import edu.uci.ics.texera.dao.jooq.generated.Tables.{
+import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables.{
   DATASET_USER_ACCESS,
   PROJECT_USER_ACCESS,
   USER,
   WORKFLOW_USER_ACCESS
 }
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ProjectDao, ProjectUserAccessDao, UserDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.ProjectUserAccess
-import edu.uci.ics.texera.web.resource.dashboard.user.project.ProjectAccessResource.userHasWriteAccess
-import io.dropwizard.auth.Auth
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{ProjectDao, ProjectUserAccessDao, UserDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.ProjectUserAccess
+import org.apache.texera.web.model.common.AccessEntry
+import org.apache.texera.web.resource.dashboard.user.project.ProjectAccessResource.userHasWriteAccess
 import org.jooq.DSLContext
 
 import java.util
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/ProjectResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/ProjectResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
index bcd9545fa49..08dcff6e40f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/ProjectResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
@@ -17,25 +17,25 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.project
+package org.apache.texera.web.resource.dashboard.user.project
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+import io.dropwizard.auth.Auth
+import org.apache.commons.lang3.StringUtils
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   ProjectDao,
   ProjectUserAccessDao,
   WorkflowOfProjectDao
 }
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos._
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.SearchQueryParams
-import edu.uci.ics.texera.web.resource.dashboard.user.project.ProjectResource._
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.hasReadAccess
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource.DashboardWorkflow
-import io.dropwizard.auth.Auth
-import org.apache.commons.lang3.StringUtils
+import org.apache.texera.dao.jooq.generated.tables.pojos._
+import org.apache.texera.web.resource.dashboard.DashboardResource
+import org.apache.texera.web.resource.dashboard.DashboardResource.SearchQueryParams
+import org.apache.texera.web.resource.dashboard.user.project.ProjectResource._
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.hasReadAccess
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource.DashboardWorkflow
 
 import java.sql.Timestamp
 import java.util
@@ -48,7 +48,7 @@ import scala.jdk.CollectionConverters.IterableHasAsScala
   * This file handles various request related to projects.
   * It sends mysql queries to the MysqlDB regarding the 'user_project',
   * 'workflow_of_project', and 'file_of_project' Tables
-  * The details of these tables can be found in /core/scripts/sql/texera_ddl.sql
+  * The details of these tables can be found in /sql/texera_ddl.sql
   */
 
 object ProjectResource {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/PublicProjectResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
similarity index 85%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
index 633d391fecd..7ba5aef4014 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.project
+package org.apache.texera.web.resource.dashboard.user.project
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.Tables.{PROJECT, PUBLIC_PROJECT, USER}
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ProjectUserAccessDao, PublicProjectDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{ProjectUserAccess, PublicProject}
 import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables.{PROJECT, PUBLIC_PROJECT, USER}
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{ProjectUserAccessDao, PublicProjectDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{ProjectUserAccess, PublicProject}
 import org.jooq.DSLContext
 
 import java.sql.Timestamp
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
index a1b644517ef..14b5199fee8 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.quota
-
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.web.resource.dashboard.user.dataset.utils.DatasetStatisticsUtils.getUserCreatedDatasets
-import edu.uci.ics.texera.web.resource.dashboard.user.quota.UserQuotaResource._
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+package org.apache.texera.web.resource.dashboard.user.quota
+
 import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.web.resource.dashboard.user.dataset.utils.DatasetStatisticsUtils.getUserCreatedDatasets
+import org.apache.texera.web.resource.dashboard.user.quota.UserQuotaResource._
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
 
 import java.util
 import javax.ws.rs._
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
index 8aa3b959486..2c92352a084 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
@@ -17,24 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.workflow
-
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.web.model.common.AccessEntry
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+package org.apache.texera.web.resource.dashboard.user.workflow
+
+import io.dropwizard.auth.Auth
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   UserDao,
   WorkflowOfUserDao,
   WorkflowUserAccessDao
 }
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowUserAccess
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.{
+import org.apache.texera.dao.jooq.generated.tables.pojos.WorkflowUserAccess
+import org.apache.texera.web.model.common.AccessEntry
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.{
   context,
   hasWriteAccess
 }
-import io.dropwizard.auth.Auth
 import org.jooq.DSLContext
 
 import java.util
@@ -220,17 +220,32 @@ class WorkflowAccessResource() {
       @PathParam("email") email: String,
       @Auth user: SessionUser
   ): Unit = {
-    if (!hasWriteAccess(wid, user.getUid)) {
-      throw new ForbiddenException(s"You do not have permission to modify workflow $wid")
-    }
+    try {
+      val targetUserUid = userDao.fetchOneByEmail(email).getUid
+      val workflowOwnerUid = workflowOfUserDao.fetchByWid(wid).get(0).getUid
 
-    context
-      .delete(WORKFLOW_USER_ACCESS)
-      .where(
-        WORKFLOW_USER_ACCESS.UID
-          .eq(userDao.fetchOneByEmail(email).getUid)
-          .and(WORKFLOW_USER_ACCESS.WID.eq(wid))
-      )
-      .execute()
+      // Prevent owner from revoking their own access
+      if (targetUserUid == workflowOwnerUid) {
+        throw new ForbiddenException("The owner cannot revoke their own access")
+      }
+
+      // Allow if: (1) user has WRITE access, OR (2) user is revoking their own access
+      val isRevokingOwnAccess = targetUserUid == user.getUid
+      if (!hasWriteAccess(wid, user.getUid) && !isRevokingOwnAccess) {
+        throw new ForbiddenException(s"You do not have permission to modify workflow $wid")
+      }
+
+      context
+        .delete(WORKFLOW_USER_ACCESS)
+        .where(
+          WORKFLOW_USER_ACCESS.UID
+            .eq(targetUserUid)
+            .and(WORKFLOW_USER_ACCESS.WID.eq(wid))
+        )
+        .execute()
+    } catch {
+      case _: NullPointerException =>
+        throw new BadRequestException(s"User $email Not Found!")
+    }
   }
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
similarity index 64%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
index c3b63a2df81..d4bf3ffd410 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
@@ -17,29 +17,35 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.workflow
-
-import edu.uci.ics.amber.core.storage.result.ExecutionResourcesMapping
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSResourceType, VFSURIFactory}
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.virtualidentity._
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
-import edu.uci.ics.amber.engine.architecture.logreplay.{ReplayDestination, ReplayLogRecord}
-import edu.uci.ics.amber.engine.common.Utils.{maptoStatusCode, stringToAggregatedState}
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.util.serde.GlobalPortIdentitySerde.SerdeOps
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.web.model.http.request.result.ResultExportRequest
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource._
-import edu.uci.ics.texera.web.service.{ExecutionsMetadataPersistService, ResultExportService}
+package org.apache.texera.web.resource.dashboard.user.workflow
+
 import io.dropwizard.auth.Auth
+import org.apache.texera.amber.core.storage.{
+  DocumentFactory,
+  FileResolver,
+  VFSResourceType,
+  VFSURIFactory
+}
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity._
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
+import org.apache.texera.amber.engine.architecture.logreplay.{ReplayDestination, ReplayLogRecord}
+import org.apache.texera.amber.engine.common.Utils.{maptoStatusCode, stringToAggregatedState}
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde.SerdeOps
+import org.apache.texera.auth.{JwtParser, SessionUser}
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.{WorkflowExecutions, User => UserPojo}
+import org.apache.texera.web.model.http.request.result.ResultExportRequest
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource._
+import org.apache.texera.web.service.{ExecutionsMetadataPersistService, ResultExportService}
 import org.jooq.DSLContext
+import play.api.libs.json.Json
 
 import java.net.URI
 import java.sql.Timestamp
@@ -102,24 +108,145 @@ object WorkflowExecutionsResource {
     }
   }
 
+  /**
+    * Computes which operators in a workflow are restricted due to dataset access controls.
+    *
+    * This function:
+    * 1. Parses the workflow JSON to find all operators and their dataset dependencies
+    * 2. Identifies operators using non-downloadable datasets that the user doesn't own
+    * 3. Uses BFS to propagate restrictions through the workflow graph
+    * 4. Returns a map of operator IDs to the restricted datasets they depend on
+    *
+    * @param wid The workflow ID
+    * @param currentUser The current user making the export request
+    * @return Map of operator ID -> Set of (ownerEmail, datasetName) tuples that block its export
+    */
+  private def getNonDownloadableOperatorMap(
+      wid: Int,
+      currentUser: UserPojo
+  ): Map[String, Set[(String, String)]] = {
+    // Load workflow
+    val workflowRecord = context
+      .select(WORKFLOW.CONTENT)
+      .from(WORKFLOW)
+      .where(WORKFLOW.WID.eq(wid).and(WORKFLOW.CONTENT.isNotNull).and(WORKFLOW.CONTENT.ne("")))
+      .fetchOne()
+
+    if (workflowRecord == null) {
+      return Map.empty
+    }
+
+    val content = workflowRecord.value1()
+
+    val rootNode =
+      try {
+        objectMapper.readTree(content)
+      } catch {
+        case _: Exception => return Map.empty
+      }
+
+    val operatorsNode = rootNode.path("operators")
+    val linksNode = rootNode.path("links")
+
+    // Collect all datasets used by operators (that user doesn't own)
+    val operatorDatasets = mutable.Map.empty[String, (String, String)]
+
+    operatorsNode.elements().asScala.foreach { operatorNode =>
+      val operatorId = operatorNode.path("operatorID").asText("")
+      if (operatorId.nonEmpty) {
+        val fileNameNode = operatorNode.path("operatorProperties").path("fileName")
+        if (fileNameNode.isTextual) {
+          FileResolver.parseDatasetOwnerAndName(fileNameNode.asText()).foreach {
+            case (ownerEmail, datasetName) =>
+              val isOwner =
+                Option(currentUser.getEmail)
+                  .exists(_.equalsIgnoreCase(ownerEmail))
+              if (!isOwner) {
+                operatorDatasets.update(operatorId, (ownerEmail, datasetName))
+              }
+          }
+        }
+      }
+    }
+
+    if (operatorDatasets.isEmpty) {
+      return Map.empty
+    }
+
+    // Query all datasets
+    val uniqueDatasets = operatorDatasets.values.toSet
+    val conditions = uniqueDatasets.map {
+      case (ownerEmail, datasetName) =>
+        USER.EMAIL.equalIgnoreCase(ownerEmail).and(DATASET.NAME.equalIgnoreCase(datasetName))
+    }
+
+    val nonDownloadableDatasets = context
+      .select(USER.EMAIL, DATASET.NAME)
+      .from(DATASET)
+      .join(USER)
+      .on(DATASET.OWNER_UID.eq(USER.UID))
+      .where(conditions.reduce((a, b) => a.or(b)))
+      .and(DATASET.IS_DOWNLOADABLE.eq(false))
+      .fetch()
+      .asScala
+      .map(record => (record.value1(), record.value2()))
+      .toSet
+
+    // Filter to only operators with non-downloadable datasets
+    val restrictedSourceMap = operatorDatasets.filter {
+      case (_, dataset) =>
+        nonDownloadableDatasets.contains(dataset)
+    }
+
+    // Build dependency graph
+    val adjacency = mutable.Map.empty[String, mutable.ListBuffer[String]]
+
+    linksNode.elements().asScala.foreach { linkNode =>
+      val sourceId = linkNode.path("source").path("operatorID").asText("")
+      val targetId = linkNode.path("target").path("operatorID").asText("")
+      if (sourceId.nonEmpty && targetId.nonEmpty) {
+        adjacency.getOrElseUpdate(sourceId, mutable.ListBuffer.empty[String]) += targetId
+      }
+    }
+
+    // BFS to propagate restrictions
+    val restrictionMap = mutable.Map.empty[String, Set[(String, String)]]
+    val queue = mutable.Queue.empty[(String, Set[(String, String)])]
+
+    restrictedSourceMap.foreach {
+      case (operatorId, dataset) =>
+        queue.enqueue(operatorId -> Set(dataset))
+    }
+
+    while (queue.nonEmpty) {
+      val (currentOperatorId, datasetSet) = queue.dequeue()
+      val existing = restrictionMap.getOrElse(currentOperatorId, Set.empty)
+      val merged = existing ++ datasetSet
+      if (merged != existing) {
+        restrictionMap.update(currentOperatorId, merged)
+        adjacency
+          .get(currentOperatorId)
+          .foreach(_.foreach(nextOperator => queue.enqueue(nextOperator -> merged)))
+      }
+    }
+
+    restrictionMap.toMap
+  }
+
   def insertOperatorPortResultUri(
       eid: ExecutionIdentity,
       globalPortId: GlobalPortIdentity,
       uri: URI
   ): Unit = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      context
-        .insertInto(OPERATOR_PORT_EXECUTIONS)
-        .columns(
-          OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID,
-          OPERATOR_PORT_EXECUTIONS.GLOBAL_PORT_ID,
-          OPERATOR_PORT_EXECUTIONS.RESULT_URI
-        )
-        .values(eid.id.toInt, globalPortId.serializeAsString, uri.toString)
-        .execute()
-    } else {
-      ExecutionResourcesMapping.addResourceUri(eid, uri)
-    }
+    context
+      .insertInto(OPERATOR_PORT_EXECUTIONS)
+      .columns(
+        OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID,
+        OPERATOR_PORT_EXECUTIONS.GLOBAL_PORT_ID,
+        OPERATOR_PORT_EXECUTIONS.RESULT_URI
+      )
+      .values(eid.id.toInt, globalPortId.serializeAsString, uri.toString)
+      .execute()
   }
 
   def insertOperatorExecutions(
@@ -158,45 +285,37 @@ object WorkflowExecutionsResource {
   }
 
   def getResultUrisByExecutionId(eid: ExecutionIdentity): List[URI] = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      context
-        .select(OPERATOR_PORT_EXECUTIONS.RESULT_URI)
-        .from(OPERATOR_PORT_EXECUTIONS)
-        .where(OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
-        .fetchInto(classOf[String])
-        .asScala
-        .toList
-        .filter(uri => uri != null && uri.nonEmpty)
-        .map(URI.create)
-    } else {
-      ExecutionResourcesMapping.getResourceURIs(eid)
-    }
+    context
+      .select(OPERATOR_PORT_EXECUTIONS.RESULT_URI)
+      .from(OPERATOR_PORT_EXECUTIONS)
+      .where(OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
+      .fetchInto(classOf[String])
+      .asScala
+      .toList
+      .filter(uri => uri != null && uri.nonEmpty)
+      .map(URI.create)
   }
 
   def getConsoleMessagesUriByExecutionId(eid: ExecutionIdentity): List[URI] =
-    if (UserSystemConfig.isUserSystemEnabled)
-      context
-        .select(OPERATOR_EXECUTIONS.CONSOLE_MESSAGES_URI)
-        .from(OPERATOR_EXECUTIONS)
-        .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
-        .fetchInto(classOf[String])
-        .asScala
-        .toList
-        .filter(uri => uri != null && uri.nonEmpty)
-        .map(URI.create)
-    else Nil
+    context
+      .select(OPERATOR_EXECUTIONS.CONSOLE_MESSAGES_URI)
+      .from(OPERATOR_EXECUTIONS)
+      .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
+      .fetchInto(classOf[String])
+      .asScala
+      .toList
+      .filter(uri => uri != null && uri.nonEmpty)
+      .map(URI.create)
 
   def getRuntimeStatsUriByExecutionId(eid: ExecutionIdentity): Option[URI] =
-    if (UserSystemConfig.isUserSystemEnabled)
-      Option(
-        context
-          .select(WORKFLOW_EXECUTIONS.RUNTIME_STATS_URI)
-          .from(WORKFLOW_EXECUTIONS)
-          .where(WORKFLOW_EXECUTIONS.EID.eq(eid.id.toInt))
-          .fetchOneInto(classOf[String])
-      ).filter(_.nonEmpty)
-        .map(URI.create)
-    else None
+    Option(
+      context
+        .select(WORKFLOW_EXECUTIONS.RUNTIME_STATS_URI)
+        .from(WORKFLOW_EXECUTIONS)
+        .where(WORKFLOW_EXECUTIONS.EID.eq(eid.id.toInt))
+        .fetchOneInto(classOf[String])
+    ).filter(_.nonEmpty)
+      .map(URI.create)
 
   def getWorkflowExecutions(
       wid: Integer,
@@ -239,18 +358,14 @@ object WorkflowExecutionsResource {
   }
 
   def deleteConsoleMessageAndExecutionResultUris(eid: ExecutionIdentity): Unit = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      context
-        .delete(OPERATOR_PORT_EXECUTIONS)
-        .where(OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
-        .execute()
-      context
-        .delete(OPERATOR_EXECUTIONS)
-        .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
-        .execute()
-    } else {
-      ExecutionResourcesMapping.removeExecutionResources(eid)
-    }
+    context
+      .delete(OPERATOR_PORT_EXECUTIONS)
+      .where(OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
+      .execute()
+    context
+      .delete(OPERATOR_EXECUTIONS)
+      .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
+      .execute()
   }
 
   /**
@@ -316,22 +431,20 @@ object WorkflowExecutionsResource {
     * @param eid Execution ID associated with the runtime statistics document.
     */
   def updateRuntimeStatsSize(eid: ExecutionIdentity): Unit = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      val statsUriOpt = context
-        .select(WORKFLOW_EXECUTIONS.RUNTIME_STATS_URI)
-        .from(WORKFLOW_EXECUTIONS)
-        .where(WORKFLOW_EXECUTIONS.EID.eq(eid.id.toInt))
-        .fetchOptionalInto(classOf[String])
-        .map(URI.create)
+    val statsUriOpt = context
+      .select(WORKFLOW_EXECUTIONS.RUNTIME_STATS_URI)
+      .from(WORKFLOW_EXECUTIONS)
+      .where(WORKFLOW_EXECUTIONS.EID.eq(eid.id.toInt))
+      .fetchOptionalInto(classOf[String])
+      .map(URI.create)
 
-      if (statsUriOpt.isPresent) {
-        val size = DocumentFactory.openDocument(statsUriOpt.get)._1.getTotalFileSize
-        context
-          .update(WORKFLOW_EXECUTIONS)
-          .set(WORKFLOW_EXECUTIONS.RUNTIME_STATS_SIZE, Integer.valueOf(size.toInt))
-          .where(WORKFLOW_EXECUTIONS.EID.eq(eid.id.toInt))
-          .execute()
-      }
+    if (statsUriOpt.isPresent) {
+      val size = DocumentFactory.openDocument(statsUriOpt.get)._1.getTotalFileSize
+      context
+        .update(WORKFLOW_EXECUTIONS)
+        .set(WORKFLOW_EXECUTIONS.RUNTIME_STATS_SIZE, Integer.valueOf(size.toInt))
+        .where(WORKFLOW_EXECUTIONS.EID.eq(eid.id.toInt))
+        .execute()
     }
   }
 
@@ -342,24 +455,22 @@ object WorkflowExecutionsResource {
     * @param opId Operator ID of the corresponding operator.
     */
   def updateConsoleMessageSize(eid: ExecutionIdentity, opId: OperatorIdentity): Unit = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      val uriOpt = context
-        .select(OPERATOR_EXECUTIONS.CONSOLE_MESSAGES_URI)
-        .from(OPERATOR_EXECUTIONS)
+    val uriOpt = context
+      .select(OPERATOR_EXECUTIONS.CONSOLE_MESSAGES_URI)
+      .from(OPERATOR_EXECUTIONS)
+      .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
+      .and(OPERATOR_EXECUTIONS.OPERATOR_ID.eq(opId.id))
+      .fetchOptionalInto(classOf[String])
+      .map(URI.create)
+
+    if (uriOpt.isPresent) {
+      val size = DocumentFactory.openDocument(uriOpt.get)._1.getTotalFileSize
+      context
+        .update(OPERATOR_EXECUTIONS)
+        .set(OPERATOR_EXECUTIONS.CONSOLE_MESSAGES_SIZE, Integer.valueOf(size.toInt))
         .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
         .and(OPERATOR_EXECUTIONS.OPERATOR_ID.eq(opId.id))
-        .fetchOptionalInto(classOf[String])
-        .map(URI.create)
-
-      if (uriOpt.isPresent) {
-        val size = DocumentFactory.openDocument(uriOpt.get)._1.getTotalFileSize
-        context
-          .update(OPERATOR_EXECUTIONS)
-          .set(OPERATOR_EXECUTIONS.CONSOLE_MESSAGES_SIZE, Integer.valueOf(size.toInt))
-          .where(OPERATOR_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
-          .and(OPERATOR_EXECUTIONS.OPERATOR_ID.eq(opId.id))
-          .execute()
-      }
+        .execute()
     }
   }
 
@@ -368,7 +479,6 @@ object WorkflowExecutionsResource {
     * this method finds the URI for a globalPortId that both: 1. matches the logicalOpId and outputPortId, and
     * 2. is an external port. Currently the lookup is O(n), where n is the number of globalPortIds for this execution.
     * TODO: Optimize the lookup once the frontend also has information about physical operators.
-    * TODO: Remove the case of using ExecutionResourceMapping when user system is permenantly enabled even in dev mode.
     */
   def getResultUriByLogicalPortId(
       eid: ExecutionIdentity,
@@ -386,18 +496,14 @@ object WorkflowExecutionsResource {
     }
 
     val urisOfEid: List[URI] =
-      if (UserSystemConfig.isUserSystemEnabled) {
-        context
-          .select(OPERATOR_PORT_EXECUTIONS.RESULT_URI)
-          .from(OPERATOR_PORT_EXECUTIONS)
-          .where(OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
-          .fetchInto(classOf[String])
-          .asScala
-          .toList
-          .map(URI.create)
-      } else {
-        ExecutionResourcesMapping.getResourceURIs(eid)
-      }
+      context
+        .select(OPERATOR_PORT_EXECUTIONS.RESULT_URI)
+        .from(OPERATOR_PORT_EXECUTIONS)
+        .where(OPERATOR_PORT_EXECUTIONS.WORKFLOW_EXECUTION_ID.eq(eid.id.toInt))
+        .fetchInto(classOf[String])
+        .asScala
+        .toList
+        .map(URI.create)
 
     urisOfEid.find(isMatchingExternalPortURI)
   }
@@ -687,78 +793,82 @@ class WorkflowExecutionsResource {
     executionsDao.update(execution)
   }
 
-  @POST
-  @Path("/result/export")
+  /**
+    * Returns which operators are restricted from export due to dataset access controls.
+    * This endpoint allows the frontend to check restrictions before attempting export.
+    *
+    * @param wid The workflow ID to check
+    * @param user The authenticated user
+    * @return JSON map of operator ID -> array of {ownerEmail, datasetName} that block its export
+    */
+  @GET
+  @Path("/{wid}/result/downloadability")
+  @Produces(Array(MediaType.APPLICATION_JSON))
   @RolesAllowed(Array("REGULAR", "ADMIN"))
-  def exportResult(
-      request: ResultExportRequest,
+  def getWorkflowResultDownloadability(
+      @PathParam("wid") wid: Integer,
       @Auth user: SessionUser
   ): Response = {
+    validateUserCanAccessWorkflow(user.getUser.getUid, wid)
 
-    if (request.operators.size <= 0)
-      Response
-        .status(Response.Status.BAD_REQUEST)
-        .`type`(MediaType.APPLICATION_JSON)
-        .entity(Map("error" -> "No operator selected").asJava)
-        .build()
+    val datasetRestrictions = getNonDownloadableOperatorMap(wid, user.user)
 
+    // Convert to frontend-friendly format: Map[operatorId -> Array[datasetLabel]]
+    val restrictionMap = datasetRestrictions.map {
+      case (operatorId, datasets) =>
+        operatorId -> datasets.map {
+          case (ownerEmail, datasetName) => s"$datasetName ($ownerEmail)"
+        }.toArray
+    }.asJava
+
+    Response.ok(restrictionMap).build()
+  }
+
+  @POST
+  @Path("/result/export/dataset")
+  @RolesAllowed(Array("REGULAR", "ADMIN"))
+  def exportResultToDataset(request: ResultExportRequest, @Auth user: SessionUser): Response = {
     try {
-      request.destination match {
-        case "local" =>
-          // CASE A: multiple operators => produce ZIP
-          if (request.operators.size > 1) {
-            val resultExportService =
-              new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId)
-            val (zipStream, zipFileNameOpt) =
-              resultExportService.exportOperatorsAsZip(request)
-
-            if (zipStream == null) {
-              throw new RuntimeException("Zip stream is null")
-            }
+      val resultExportService =
+        new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId)
+      resultExportService.exportToDataset(user.user, request)
 
-            val finalFileName = zipFileNameOpt.getOrElse("operators.zip")
-            return Response
-              .ok(zipStream, "application/zip")
-              .header("Content-Disposition", "attachment; filename=\"" + finalFileName + "\"")
-              .build()
-          }
+    } catch {
+      case ex: Exception =>
+        Response
+          .status(Response.Status.INTERNAL_SERVER_ERROR)
+          .`type`(MediaType.APPLICATION_JSON)
+          .entity(Map("error" -> ex.getMessage).asJava)
+          .build()
+    }
+  }
 
-          // CASE B: exactly one operator => single file
-          if (request.operators.size != 1) {
-            return Response
-              .status(Response.Status.BAD_REQUEST)
-              .`type`(MediaType.APPLICATION_JSON)
-              .entity(Map("error" -> "Local download does not support no operator.").asJava)
-              .build()
-          }
-          val singleOp = request.operators.head
-
-          val resultExportService =
-            new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId)
-          val (streamingOutput, fileNameOpt) =
-            resultExportService.exportOperatorResultAsStream(request, singleOp)
-
-          if (streamingOutput == null) {
-            return Response
-              .status(Response.Status.INTERNAL_SERVER_ERROR)
-              .`type`(MediaType.APPLICATION_JSON)
-              .entity(Map("error" -> "Failed to export operator").asJava)
-              .build()
-          }
+  @POST
+  @Path("/result/export/local")
+  @Consumes(Array(MediaType.APPLICATION_FORM_URLENCODED))
+  def exportResultToLocal(
+      @FormParam("request") requestJson: String,
+      @FormParam("token") token: String
+  ): Response = {
 
-          val finalFileName = fileNameOpt.getOrElse("download.dat")
-          Response
-            .ok(streamingOutput, MediaType.APPLICATION_OCTET_STREAM)
-            .header("Content-Disposition", "attachment; filename=\"" + finalFileName + "\"")
-            .build()
-        case _ =>
-          // destination = "dataset" by default
-          val resultExportService =
-            new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId)
-          val exportResponse =
-            resultExportService.exportAllOperatorsResultToDataset(user.user, request)
-          Response.ok(exportResponse).build()
+    try {
+      val userOpt = JwtParser.parseToken(token)
+      if (userOpt.isPresent) {
+        val user = userOpt.get()
+        val role = user.getUser.getRole
+        val RolesAllowed = Set(UserRoleEnum.REGULAR, UserRoleEnum.ADMIN)
+        if (!RolesAllowed.contains(role)) {
+          throw new RuntimeException("User role is not allowed to perform this download")
+        }
+      } else {
+        throw new RuntimeException("Invalid or expired token")
       }
+
+      val request = Json.parse(requestJson).as[ResultExportRequest]
+      val resultExportService =
+        new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId)
+      resultExportService.exportToLocal(request)
+
     } catch {
       case ex: Exception =>
         Response
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
similarity index 94%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
index c933d3717a8..45ed49a23dc 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
@@ -17,29 +17,30 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.workflow
+package org.apache.texera.web.resource.dashboard.user.workflow
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.virtualidentity.ExecutionIdentity
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+import io.dropwizard.auth.Auth
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   WorkflowDao,
   WorkflowOfProjectDao,
   WorkflowOfUserDao,
   WorkflowUserAccessDao
 }
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos._
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.web.resource.dashboard.hub.EntityType
-import edu.uci.ics.texera.web.resource.dashboard.hub.HubResource.recordCloneAction
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.hasReadAccess
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource._
-import io.dropwizard.auth.Auth
+import org.apache.texera.dao.jooq.generated.tables.pojos._
+import org.apache.texera.service.util.LargeBinaryManager
+import org.apache.texera.web.resource.dashboard.hub.EntityType
+import org.apache.texera.web.resource.dashboard.hub.HubResource.recordCloneAction
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.hasReadAccess
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource._
 import org.jooq.impl.DSL.{groupConcatDistinct, noCondition}
 import org.jooq.{Condition, Record9, Result, SelectOnConditionStep}
 
@@ -57,7 +58,7 @@ import scala.util.control.NonFatal
 /**
   * This file handles various request related to saved-workflows.
   * It sends mysql queries to the MysqlDB regarding the UserWorkflow Table
-  * The details of UserWorkflowTable can be found in /core/scripts/sql/texera_ddl.sql
+  * The details of UserWorkflowTable can be found in /sql/texera_ddl.sql
   */
 
 object WorkflowResource {
@@ -421,7 +422,7 @@ class WorkflowResource extends LazyLogging {
   @Path("/persist")
   def persistWorkflow(workflow: Workflow, @Auth sessionUser: SessionUser): Workflow = {
     val user = sessionUser.getUser
-    if (user == edu.uci.ics.texera.web.auth.GuestAuthFilter.GUEST) {
+    if (user == org.apache.texera.web.auth.GuestAuthFilter.GUEST) {
       throw new ForbiddenException("Guest user does not have access to db.")
     }
 
@@ -600,6 +601,8 @@ class WorkflowResource extends LazyLogging {
         .asScala
         .toList
 
+      LargeBinaryManager.deleteAllObjects()
+
       // Collect all URIs related to executions for cleanup
       val uris = eids.flatMap { eid =>
         val executionId = ExecutionIdentity(eid.longValue())
@@ -709,23 +712,16 @@ class WorkflowResource extends LazyLogging {
   }
 
   @GET
-  @Path("/owner_user")
-  def getOwnerUser(@QueryParam("wid") wid: Integer): User = {
+  @Produces(Array(MediaType.TEXT_PLAIN))
+  @Path("/owner_name")
+  def getOwnerName(@QueryParam("wid") wid: Integer): String = {
     context
-      .select(
-        USER.UID,
-        USER.NAME,
-        USER.EMAIL,
-        USER.PASSWORD,
-        USER.GOOGLE_ID,
-        USER.ROLE,
-        USER.GOOGLE_AVATAR
-      )
-      .from(WORKFLOW_OF_USER)
-      .join(USER)
-      .on(WORKFLOW_OF_USER.UID.eq(USER.UID))
+      .select(USER.NAME)
+      .from(USER)
+      .join(WORKFLOW_OF_USER)
+      .on(USER.UID.eq(WORKFLOW_OF_USER.UID))
       .where(WORKFLOW_OF_USER.WID.eq(wid))
-      .fetchOneInto(classOf[User])
+      .fetchOneInto(classOf[String])
   }
 
   @GET
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
rename to amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
index c054413cf8f..7b8141be7f5 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.workflow
+package org.apache.texera.web.resource.dashboard.user.workflow
 
 import com.flipkart.zjsonpatch.{JsonDiff, JsonPatch}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.jooq.generated.Tables.WORKFLOW_VERSION
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Workflow, WorkflowVersion}
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource.{
+import io.dropwizard.auth.Auth
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.config.UserSystemConfig
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables.WORKFLOW_VERSION
+import org.apache.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Workflow, WorkflowVersion}
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource.{
   DashboardWorkflow,
   assignNewOperatorIds
 }
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource._
-import io.dropwizard.auth.Auth
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource._
 import org.jooq.DSLContext
 
 import java.sql.Timestamp
@@ -43,7 +43,7 @@ import scala.jdk.CollectionConverters.IterableHasAsScala
 
 /**
   * This file handles various request related to workflows versions.
-  * The details of the mysql tables can be found in /core/scripts/sql/texera_ddl.sql
+  * The details of the mysql tables can be found in /sql/texera_ddl.sql
   */
 
 object WorkflowVersionResource {
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/EmailNotificationService.scala b/amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala
similarity index 92%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/EmailNotificationService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala
index d94f53cd9f8..8f1c49c9595 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/EmailNotificationService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
 
 import java.util.concurrent.{ExecutorService, Executors}
 import scala.concurrent.{ExecutionContext, Future}
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala
index f69a1c81d33..1678494e937 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala
@@ -17,54 +17,53 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.google.protobuf.timestamp.Timestamp
 import com.twitter.util.{Await, Duration}
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.COMMAND
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.storage.model.BufferedItemWriter
+import org.apache.texera.amber.core.storage.result.ResultSchema
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, OperatorIdentity}
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.engine.architecture.controller.ExecutionStateUpdate
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.COMMAND
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   ConsoleMessage,
   ConsoleMessageType,
   EvaluatePythonExpressionRequest,
   DebugCommandRequest => AmberDebugCommandRequest
 }
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.engine.common.executionruntimestate.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
+  COMPLETED,
+  FAILED,
+  KILLED
+}
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.common.executionruntimestate.{
   EvaluatedValueList,
   ExecutionConsoleStore,
   OperatorConsole
 }
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, OperatorIdentity}
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
-import edu.uci.ics.texera.web.model.websocket.event.python.ConsoleUpdateEvent
-import edu.uci.ics.texera.web.model.websocket.request.RetryRequest
-import edu.uci.ics.texera.web.model.websocket.request.python.{
+import org.apache.texera.amber.util.VirtualIdentityUtils
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.model.websocket.event.python.ConsoleUpdateEvent
+import org.apache.texera.web.model.websocket.request.RetryRequest
+import org.apache.texera.web.model.websocket.request.python.{
   DebugCommandRequest,
   PythonExpressionEvaluateRequest
 }
-import edu.uci.ics.texera.web.model.websocket.response.python.PythonExpressionEvaluateResponse
-import edu.uci.ics.texera.web.storage.ExecutionStateStore
-import edu.uci.ics.texera.web.{SubscriptionManager, WebsocketInput}
-import edu.uci.ics.amber.core.storage.model.BufferedItemWriter
-import edu.uci.ics.amber.core.storage.result.ResultSchema
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.architecture.controller.ExecutionStateUpdate
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
-  COMPLETED,
-  FAILED,
-  KILLED
-}
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.model.websocket.response.python.PythonExpressionEvaluateResponse
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.storage.ExecutionStateStore
+import org.apache.texera.web.{SubscriptionManager, WebsocketInput}
 
-import java.util.concurrent.{ExecutorService, Executors}
 import java.time.Instant
+import java.util.concurrent.{ExecutorService, Executors}
 import scala.collection.mutable
 
 /**
@@ -139,8 +138,7 @@ class ExecutionConsoleService(
   private val consoleMessageOpIdToWriterMap: mutable.Map[String, BufferedItemWriter[Tuple]] =
     mutable.Map()
 
-  private val consoleWriterThread: Option[ExecutorService] =
-    Option.when(UserSystemConfig.isUserSystemEnabled)(Executors.newSingleThreadExecutor())
+  private val consoleWriterThread: ExecutorService = Executors.newSingleThreadExecutor()
 
   private def getOrCreateWriter(opId: OperatorIdentity): BufferedItemWriter[Tuple] = {
     consoleMessageOpIdToWriterMap.getOrElseUpdate(
@@ -261,21 +259,19 @@ class ExecutionConsoleService(
       consoleMessage: ConsoleMessage
   ): ExecutionConsoleStore = {
     // Write the original full message to the database
-    consoleWriterThread.foreach { thread =>
-      thread.execute(() => {
-        val writer = getOrCreateWriter(OperatorIdentity(opId))
-        try {
-          val tuple = new Tuple(
-            ResultSchema.consoleMessagesSchema,
-            Array(consoleMessage.toProtoString)
-          )
-          writer.putOne(tuple)
-        } catch {
-          case e: Exception =>
-            logger.error(s"Error while writing console message for operator $opId", e)
-        }
-      })
-    }
+    consoleWriterThread.execute(() => {
+      val writer = getOrCreateWriter(OperatorIdentity(opId))
+      try {
+        val tuple = new Tuple(
+          ResultSchema.consoleMessagesSchema,
+          Array(consoleMessage.toProtoString)
+        )
+        writer.putOne(tuple)
+      } catch {
+        case e: Exception =>
+          logger.error(s"Error while writing console message for operator $opId", e)
+      }
+    })
 
     // Process the message (truncate if needed) and update store
     val truncatedMessage = processConsoleMessage(consoleMessage)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionReconfigurationService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionReconfigurationService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala
index 6b59f1cec58..e5867277fc9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionReconfigurationService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
-import edu.uci.ics.amber.engine.architecture.controller.Workflow
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.texera.web.SubscriptionManager
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
-import edu.uci.ics.texera.web.model.websocket.request.ModifyLogicRequest
-import edu.uci.ics.texera.web.model.websocket.response.{
+import org.apache.texera.amber.engine.architecture.controller.Workflow
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.web.SubscriptionManager
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.model.websocket.request.ModifyLogicRequest
+import org.apache.texera.web.model.websocket.response.{
   ModifyLogicCompletedEvent,
   ModifyLogicResponse
 }
-import edu.uci.ics.texera.web.storage.ExecutionStateStore
+import org.apache.texera.web.storage.ExecutionStateStore
 
 import scala.util.{Failure, Success}
 
@@ -112,13 +112,13 @@ class ExecutionReconfigurationService(
     //      case (op, stateTransferFunc) =>
     //        val bytes = AmberRuntime.serde.serialize(op.opExecInitInfo).get
     //        val protoAny = Any.of(
-    //          "edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo",
+    //          "org.apache.texera.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo",
     //          ByteString.copyFrom(bytes)
     //        )
     //        val stateTransferFuncOpt = stateTransferFunc.map { func =>
     //          val bytes = AmberRuntime.serde.serialize(func).get
     //          Any.of(
-    //            "edu.uci.ics.texera.workflow.common.operators.StateTransferFunc",
+    //            "org.apache.texera.workflow.common.operators.StateTransferFunc",
     //            ByteString.copyFrom(bytes)
     //          )
     //        }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala
similarity index 87%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala
index dba15ff293f..8810e9891f4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala
@@ -17,47 +17,47 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
-import akka.actor.Cancellable
+import org.apache.pekko.actor.Cancellable
 import com.fasterxml.jackson.annotation.{JsonTypeInfo, JsonTypeName}
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.{ApplicationConfig, StorageConfig}
-import edu.uci.ics.amber.core.storage.DocumentFactory.ICEBERG
-import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.storage.result._
-import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple, TupleUtils}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity}
-import edu.uci.ics.amber.engine.architecture.controller.{ExecutionStateUpdate, FatalError}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
+import org.apache.texera.amber.config.{ApplicationConfig, StorageConfig}
+import org.apache.texera.amber.core.storage.DocumentFactory.ICEBERG
+import org.apache.texera.amber.core.storage.model.VirtualDocument
+import org.apache.texera.amber.core.storage.result._
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.{AttributeType, Tuple, TupleUtils}
+import org.apache.texera.amber.core.virtualidentity.{
+  ExecutionIdentity,
+  OperatorIdentity,
+  WorkflowIdentity
+}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity}
+import org.apache.texera.amber.engine.architecture.controller.{ExecutionStateUpdate, FatalError}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
   COMPLETED,
   FAILED,
   KILLED,
   RUNNING,
   TERMINATED
 }
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.engine.common.executionruntimestate.ExecutionMetadataStore
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.core.virtualidentity.{
-  ExecutionIdentity,
-  OperatorIdentity,
-  WorkflowIdentity
-}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.texera.web.SubscriptionManager
-import edu.uci.ics.texera.web.model.websocket.event.{
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionMetadataStore
+import org.apache.texera.web.SubscriptionManager
+import org.apache.texera.web.model.websocket.event.{
   PaginatedResultEvent,
   TexeraWebSocketEvent,
   WebResultUpdateEvent
 }
-import edu.uci.ics.texera.web.model.websocket.request.ResultPaginationRequest
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
-import edu.uci.ics.texera.web.service.ExecutionResultService.convertTuplesToJson
-import edu.uci.ics.texera.web.service.WorkflowExecutionService.getLatestExecutionId
-import edu.uci.ics.texera.web.storage.{ExecutionStateStore, WorkflowStateStore}
+import org.apache.texera.web.model.websocket.request.ResultPaginationRequest
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.service.ExecutionResultService.convertTuplesToJson
+import org.apache.texera.web.service.WorkflowExecutionService.getLatestExecutionId
+import org.apache.texera.web.storage.{ExecutionStateStore, WorkflowStateStore}
 
 import java.util.UUID
 import scala.collection.mutable
@@ -437,12 +437,25 @@ class ExecutionResultService(
 
     storageUriOption match {
       case Some(storageUri) =>
+        val (document, schemaOption) = DocumentFactory.openDocument(storageUri)
+        val virtualDocument = document.asInstanceOf[VirtualDocument[Tuple]]
+
+        val columns = {
+          val schema = schemaOption.get
+          val allColumns = schema.getAttributeNames
+          val filteredColumns = request.columnSearch match {
+            case Some(search) =>
+              allColumns.filter(col => col.toLowerCase.contains(search.toLowerCase))
+            case None => allColumns
+          }
+          Some(
+            filteredColumns.slice(request.columnOffset, request.columnOffset + request.columnLimit)
+          )
+        }
+
         val paginationIterable = {
-          DocumentFactory
-            .openDocument(storageUri)
-            ._1
-            .asInstanceOf[VirtualDocument[Tuple]]
-            .getRange(from, from + request.pageSize)
+          virtualDocument
+            .getRange(from, from + request.pageSize, columns)
             .to(Iterable)
         }
         val mappedResults = convertTuplesToJson(paginationIterable)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala
similarity index 83%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala
index a634d921e0f..70b2f07920a 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.engine.architecture.controller.ExecutionStateUpdate
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity
+import org.apache.texera.amber.engine.architecture.controller.ExecutionStateUpdate
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   EmptyRequest,
   TakeGlobalCheckpointRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.FaultToleranceConfig
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.core.virtualidentity.EmbeddedControlMessageIdentity
-import edu.uci.ics.texera.web.model.websocket.request._
-import edu.uci.ics.texera.web.storage.ExecutionStateStore
-import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState
-import edu.uci.ics.texera.web.{SubscriptionManager, WebsocketInput}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.FaultToleranceConfig
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.web.model.websocket.request._
+import org.apache.texera.web.storage.ExecutionStateStore
+import org.apache.texera.web.storage.ExecutionStateStore.updateWorkflowState
+import org.apache.texera.web.{SubscriptionManager, WebsocketInput}
 
 import java.net.URI
 import java.util.UUID
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala
similarity index 64%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala
index 6aabe7c4eb5..841c7112c7b 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala
@@ -17,50 +17,46 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.google.protobuf.timestamp.Timestamp
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.storage.model.BufferedItemWriter
-import edu.uci.ics.amber.core.storage.result.ResultSchema
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.engine.architecture.controller.{
-  ExecutionStateUpdate,
-  ExecutionStatsUpdate,
-  FatalError,
-  WorkerAssignmentUpdate,
-  WorkflowRecoveryStatus
-}
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
+import org.apache.texera.amber.core.storage.model.BufferedItemWriter
+import org.apache.texera.amber.core.storage.result.ResultSchema
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.engine.architecture.controller._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
   COMPLETED,
   FAILED,
   KILLED
 }
-import edu.uci.ics.amber.engine.common.Utils.maptoStatusCode
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.engine.common.executionruntimestate.{
+import org.apache.texera.amber.engine.common.Utils
+import org.apache.texera.amber.engine.common.Utils.maptoStatusCode
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.common.executionruntimestate.{
   OperatorMetrics,
   OperatorStatistics,
   OperatorWorkerMapping
 }
-import edu.uci.ics.amber.engine.common.Utils
-import edu.uci.ics.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses}
-import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
-import edu.uci.ics.texera.web.SubscriptionManager
-import edu.uci.ics.texera.web.model.websocket.event.{
+import org.apache.texera.amber.error.ErrorUtils.{
+  getOperatorFromActorIdOpt,
+  getStackTraceWithAllCauses
+}
+import org.apache.texera.web.SubscriptionManager
+import org.apache.texera.web.model.websocket.event.{
   ExecutionDurationUpdateEvent,
   OperatorAggregatedMetrics,
   OperatorStatisticsUpdateEvent,
   WorkerAssignmentUpdateEvent
 }
-import edu.uci.ics.texera.web.storage.ExecutionStateStore
-import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.storage.ExecutionStateStore
+import org.apache.texera.web.storage.ExecutionStateStore.updateWorkflowState
 
 import java.time.Instant
 import java.util.concurrent.Executors
@@ -72,30 +68,26 @@ class ExecutionStatsService(
 ) extends SubscriptionManager
     with LazyLogging {
   private val (metricsPersistThread, runtimeStatsWriter) = {
-    if (UserSystemConfig.isUserSystemEnabled) {
-      val thread = Executors.newSingleThreadExecutor()
-      val uri = VFSURIFactory.createRuntimeStatisticsURI(
-        workflowContext.workflowId,
-        workflowContext.executionId
-      )
-      val writer = DocumentFactory
-        .createDocument(uri, ResultSchema.runtimeStatisticsSchema)
-        .writer("runtime_statistics")
-        .asInstanceOf[BufferedItemWriter[Tuple]]
-      WorkflowExecutionsResource.updateRuntimeStatsUri(
-        workflowContext.workflowId.id,
-        workflowContext.executionId.id,
-        uri
-      )
-      writer.open()
-      (Some(thread), Some(writer))
-    } else {
-      (None, None)
-    }
+    val thread = Executors.newSingleThreadExecutor()
+    val uri = VFSURIFactory.createRuntimeStatisticsURI(
+      workflowContext.workflowId,
+      workflowContext.executionId
+    )
+    val writer = DocumentFactory
+      .createDocument(uri, ResultSchema.runtimeStatisticsSchema)
+      .writer("runtime_statistics")
+      .asInstanceOf[BufferedItemWriter[Tuple]]
+    WorkflowExecutionsResource.updateRuntimeStatsUri(
+      workflowContext.workflowId.id,
+      workflowContext.executionId.id,
+      uri
+    )
+    writer.open()
+    (thread, writer)
   }
 
-  private var lastPersistedMetrics: Option[Map[String, OperatorMetrics]] =
-    Option.when(UserSystemConfig.isUserSystemEnabled)(Map.empty[String, OperatorMetrics])
+  private var lastPersistedMetrics: Map[String, OperatorMetrics] =
+    Map.empty[String, OperatorMetrics]
 
   registerCallbacks()
 
@@ -189,12 +181,10 @@ class ExecutionStatsService(
           stateStore.statsStore.updateState { statsStore =>
             statsStore.withOperatorInfo(evt.operatorMetrics)
           }
-          metricsPersistThread.foreach { thread =>
-            thread.execute(() => {
-              storeRuntimeStatistics(computeStatsDiff(evt.operatorMetrics))
-              lastPersistedMetrics = Some(evt.operatorMetrics)
-            })
-          }
+          metricsPersistThread.execute(() => {
+            storeRuntimeStatistics(computeStatsDiff(evt.operatorMetrics))
+            lastPersistedMetrics = evt.operatorMetrics
+          })
         })
     )
   }
@@ -204,13 +194,11 @@ class ExecutionStatsService(
       case ExecutionStateUpdate(state: WorkflowAggregatedState.Recognized)
           if Set(COMPLETED, FAILED, KILLED).contains(state) =>
         logger.info("Workflow execution terminated. Commit runtime statistics.")
-        runtimeStatsWriter.foreach { writer =>
-          try {
-            writer.close()
-          } catch {
-            case e: Exception =>
-              logger.error("Failed to close runtime statistics writer", e)
-          }
+        try {
+          runtimeStatsWriter.close()
+        } catch {
+          case e: Exception =>
+            logger.error("Failed to close runtime statistics writer", e)
         }
       case _ =>
     }
@@ -225,15 +213,12 @@ class ExecutionStatsService(
       OperatorStatistics(Seq.empty, Seq.empty, 0, 0, 0, 0)
     )
 
-    // Retrieve the last persisted metrics or default to an empty map
-    val lastMetrics = lastPersistedMetrics.getOrElse(Map.empty)
-
     // Determine new and old keys
-    val newKeys = newMetrics.keySet.diff(lastMetrics.keySet)
-    val oldKeys = lastMetrics.keySet.diff(newMetrics.keySet)
+    val newKeys = newMetrics.keySet.diff(lastPersistedMetrics.keySet)
+    val oldKeys = lastPersistedMetrics.keySet.diff(newMetrics.keySet)
 
     // Update last metrics with default metrics for new keys
-    val updatedLastMetrics = lastMetrics ++ newKeys.map(_ -> defaultMetrics)
+    val updatedLastMetrics = lastPersistedMetrics ++ newKeys.map(_ -> defaultMetrics)
 
     // Combine new metrics with old metrics for keys that are no longer present
     val completeMetricsMap = newMetrics ++ oldKeys.map(key => key -> updatedLastMetrics(key))
@@ -258,34 +243,29 @@ class ExecutionStatsService(
   private def storeRuntimeStatistics(
       operatorStatistics: scala.collection.immutable.Map[String, OperatorMetrics]
   ): Unit = {
-    runtimeStatsWriter match {
-      case Some(writer) =>
-        try {
-          operatorStatistics.foreach {
-            case (operatorId, stat) =>
-              val runtimeStats = new Tuple(
-                ResultSchema.runtimeStatisticsSchema,
-                Array(
-                  operatorId,
-                  new java.sql.Timestamp(System.currentTimeMillis()),
-                  stat.operatorStatistics.inputMetrics.map(_.tupleMetrics.count).sum,
-                  stat.operatorStatistics.inputMetrics.map(_.tupleMetrics.size).sum,
-                  stat.operatorStatistics.outputMetrics.map(_.tupleMetrics.count).sum,
-                  stat.operatorStatistics.outputMetrics.map(_.tupleMetrics.size).sum,
-                  stat.operatorStatistics.dataProcessingTime,
-                  stat.operatorStatistics.controlProcessingTime,
-                  stat.operatorStatistics.idleTime,
-                  stat.operatorStatistics.numWorkers,
-                  maptoStatusCode(stat.operatorState).toInt
-                )
-              )
-              writer.putOne(runtimeStats)
-          }
-        } catch {
-          case err: Throwable => logger.error("error occurred when storing runtime statistics", err)
-        }
-      case None =>
-        logger.warn("Runtime statistics writer is not available.")
+    try {
+      operatorStatistics.foreach {
+        case (operatorId, stat) =>
+          val runtimeStats = new Tuple(
+            ResultSchema.runtimeStatisticsSchema,
+            Array(
+              operatorId,
+              new java.sql.Timestamp(System.currentTimeMillis()),
+              stat.operatorStatistics.inputMetrics.map(_.tupleMetrics.count).sum,
+              stat.operatorStatistics.inputMetrics.map(_.tupleMetrics.size).sum,
+              stat.operatorStatistics.outputMetrics.map(_.tupleMetrics.count).sum,
+              stat.operatorStatistics.outputMetrics.map(_.tupleMetrics.size).sum,
+              stat.operatorStatistics.dataProcessingTime,
+              stat.operatorStatistics.controlProcessingTime,
+              stat.operatorStatistics.idleTime,
+              stat.operatorStatistics.numWorkers,
+              maptoStatusCode(stat.operatorState).toInt
+            )
+          )
+          runtimeStatsWriter.putOne(runtimeStats)
+      }
+    } catch {
+      case err: Throwable => logger.error("error occurred when storing runtime statistics", err)
     }
   }
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
similarity index 81%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
index c1f49a84705..1140f5f5ccd 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
@@ -17,16 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.workflow.WorkflowContext.DEFAULT_EXECUTION_ID
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource._
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource._
 
 import java.sql.Timestamp
 
@@ -57,7 +55,6 @@ object ExecutionsMetadataPersistService extends LazyLogging {
       environmentVersion: String,
       computingUnitId: Integer
   ): ExecutionIdentity = {
-    if (!UserSystemConfig.isUserSystemEnabled) return DEFAULT_EXECUTION_ID
     // first retrieve the latest version of this workflow
     val vid = getLatestVersion(workflowId.id.toInt)
     val newExecution = new WorkflowExecutions()
@@ -77,7 +74,6 @@ object ExecutionsMetadataPersistService extends LazyLogging {
   }
 
   def tryGetExistingExecution(executionId: ExecutionIdentity): Option[WorkflowExecutions] = {
-    if (!UserSystemConfig.isUserSystemEnabled) return None
     try {
       Some(workflowExecutionsDao.fetchOneByEid(executionId.id.toInt))
     } catch {
@@ -90,7 +86,6 @@ object ExecutionsMetadataPersistService extends LazyLogging {
   def tryUpdateExistingExecution(
       executionId: ExecutionIdentity
   )(updateFunc: WorkflowExecutions => Unit): Unit = {
-    if (!UserSystemConfig.isUserSystemEnabled) return
     try {
       val execution = workflowExecutionsDao.fetchOneByEid(executionId.id.toInt)
       updateFunc(execution)
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala b/amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala
rename to amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala
index c93af5d6caf..c2a15106b19 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
-import edu.uci.ics.amber.core.workflow.PhysicalPlan
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.core.workflow.PhysicalPlan
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   ModifyLogicRequest,
   PropagateEmbeddedControlMessageRequest
 }
-import edu.uci.ics.amber.engine.architecture.scheduling.{Region, WorkflowExecutionCoordinator}
-import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity
+import org.apache.texera.amber.engine.architecture.scheduling.{Region, WorkflowExecutionCoordinator}
 import org.jgrapht.alg.connectivity.ConnectivityInspector
 
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala b/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala
index d4125883a97..e4fdc92da94 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala
@@ -17,47 +17,49 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
+import com.fasterxml.jackson.core.`type`.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.github.tototoshi.csv.CSVWriter
-import edu.uci.ics.amber.config.EnvironmentalVariable
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.util.ArrowUtils
-import edu.uci.ics.texera.auth.JwtAuth
-import edu.uci.ics.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.model.http.request.result.{OperatorExportInfo, ResultExportRequest}
-import edu.uci.ics.texera.web.model.http.response.result.ResultExportResponse
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.{
+import org.apache.texera.amber.config.EnvironmentalVariable
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.model.VirtualDocument
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.ArrowUtils
+import org.apache.arrow.memory.RootAllocator
+import org.apache.arrow.vector._
+import org.apache.arrow.vector.ipc.ArrowFileWriter
+import org.apache.commons.io.IOUtils
+import org.apache.commons.lang3.StringUtils
+import org.apache.texera.auth.JwtAuth
+import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims}
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.web.model.http.request.result.{OperatorExportInfo, ResultExportRequest}
+import org.apache.texera.web.model.http.response.result.ResultExportResponse
+import org.apache.texera.web.resource.dashboard.user.workflow.{
   WorkflowExecutionsResource,
   WorkflowVersionResource
 }
-import edu.uci.ics.texera.web.service.WorkflowExecutionService.getLatestExecutionId
+import org.apache.texera.web.service.WorkflowExecutionService.getLatestExecutionId
 
 import java.io.{FilterOutputStream, IOException, OutputStream}
+import java.net.{HttpURLConnection, URL, URLEncoder}
 import java.nio.channels.Channels
 import java.nio.charset.StandardCharsets
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.util.zip.{ZipEntry, ZipOutputStream}
-import scala.collection.mutable
-import scala.util.Using
-import org.apache.arrow.memory.RootAllocator
-import org.apache.arrow.vector._
-import org.apache.arrow.vector.ipc.ArrowFileWriter
-import org.apache.commons.lang3.StringUtils
-
 import javax.ws.rs.WebApplicationException
-import javax.ws.rs.core.StreamingOutput
-import java.net.{HttpURLConnection, URL, URLEncoder}
+import javax.ws.rs.core.{MediaType, Response, StreamingOutput}
+import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
-
-import org.apache.commons.io.IOUtils
+import scala.jdk.CollectionConverters._
+import scala.util.Using
 
 object Constants {
   val CHUNK_SIZE = 10
@@ -91,12 +93,12 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I
   import ResultExportService._
 
   /**
-    * Export results for all specified operators in the request.
+    * Export operator results to a dataset and return the result.
     */
-  def exportAllOperatorsResultToDataset(
+  def exportToDataset(
       user: User,
       request: ResultExportRequest
-  ): ResultExportResponse = {
+  ): Response = {
     val successMessages = new mutable.ListBuffer[String]()
     val errorMessages = new mutable.ListBuffer[String]()
 
@@ -111,13 +113,49 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I
       }
     }
 
+    var exportResponse: ResultExportResponse = null
     if (errorMessages.isEmpty) {
-      ResultExportResponse("success", successMessages.mkString("\n"))
+      exportResponse = ResultExportResponse("success", successMessages.mkString("\n"))
     } else if (successMessages.isEmpty) {
-      ResultExportResponse("error", errorMessages.mkString("\n"))
+      exportResponse = ResultExportResponse("error", errorMessages.mkString("\n"))
     } else {
       // At least one success, so we consider overall success (with partial possible).
-      ResultExportResponse("success", successMessages.mkString("\n"))
+      exportResponse = ResultExportResponse("success", successMessages.mkString("\n"))
+    }
+
+    Response.ok(exportResponse).build()
+  }
+
+  /**
+    * Export operator results as downloadable files.
+    * If multiple operators are selected, their results are streamed as a ZIP file.
+    * If a single operator is selected, its result is streamed directly.
+    */
+  def exportToLocal(request: ResultExportRequest): Response = {
+    if (request.operators.size > 1) {
+      val (zipStream, zipFileNameOpt) = exportOperatorsAsZip(request)
+      if (zipStream == null) {
+        throw new RuntimeException("Zip stream is null")
+      }
+      val fileName = zipFileNameOpt.getOrElse("operators.zip")
+
+      Response
+        .ok(zipStream, "application/zip")
+        .header("Content-Disposition", s"""attachment; filename="$fileName"""")
+        .build()
+
+    } else {
+      val op = request.operators.head
+      val (streamingOutput, fileNameOpt) = exportOperatorResultAsStream(request, op)
+      if (streamingOutput == null) {
+        throw new RuntimeException("Failed to export operator")
+      }
+      val fileName = fileNameOpt.getOrElse("download.dat")
+
+      Response
+        .ok(streamingOutput, MediaType.APPLICATION_OCTET_STREAM)
+        .header("Content-Disposition", s"""attachment; filename="$fileName"""")
+        .build()
     }
   }
 
@@ -205,10 +243,6 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I
   def exportOperatorsAsZip(
       request: ResultExportRequest
   ): (StreamingOutput, Option[String]) = {
-    if (request.operators.isEmpty) {
-      return (null, None)
-    }
-
     val timestamp = LocalDateTime
       .now()
       .truncatedTo(ChronoUnit.SECONDS)
@@ -562,4 +596,29 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I
     // remove path separators
     StringUtils.replaceEach(rawName, Array("/", "\\"), Array("", ""))
   }
+
+  /**
+    * Parse a JSON string array of operators into a list of OperatorExportInfo objects.
+    */
+  def parseOperators(operatorsJson: String): List[OperatorExportInfo] = {
+    new ObjectMapper()
+      .registerModule(DefaultScalaModule)
+      .readValue(operatorsJson, new TypeReference[List[OperatorExportInfo]] {})
+  }
+
+  /**
+    * Validate an export request by checking if any operators are selected.
+    * Return an error response if none are selected, otherwise None.
+    */
+  def validateExportRequest(request: ResultExportRequest): Option[Response] = {
+    if (request.operators.isEmpty) {
+      Some(
+        Response
+          .status(Response.Status.BAD_REQUEST)
+          .`type`(MediaType.APPLICATION_JSON)
+          .entity(Map("error" -> "No operator selected").asJava)
+          .build()
+      )
+    } else None
+  }
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowEmailNotifier.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowEmailNotifier.scala
rename to amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala
index 82046432685..af9a26286d4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowEmailNotifier.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource
-import edu.uci.ics.texera.web.resource.{EmailMessage, GmailResource}
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource
+import org.apache.texera.web.resource.{EmailMessage, GmailResource}
 import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator
 
 import java.net.URI
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala
similarity index 79%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala
index b6c8cbb88e6..741687e02c9 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala
@@ -17,30 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.core.workflow.WorkflowContext.DEFAULT_EXECUTION_ID
-import edu.uci.ics.amber.engine.architecture.controller.{ControllerConfig, Workflow}
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmptyRequest
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.engine.common.executionruntimestate.ExecutionMetadataStore
-import edu.uci.ics.amber.engine.common.Utils
-import edu.uci.ics.texera.config.UserSystemConfig
-import edu.uci.ics.texera.web.model.websocket.event.{
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.engine.architecture.controller.{ControllerConfig, Workflow}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmptyRequest
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._
+import org.apache.texera.amber.engine.common.Utils
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionMetadataStore
+import org.apache.texera.web.model.websocket.event.{
   TexeraWebSocketEvent,
   WorkflowErrorEvent,
   WorkflowStateEvent
 }
-import edu.uci.ics.texera.web.model.websocket.request.WorkflowExecuteRequest
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
-import edu.uci.ics.texera.web.storage.ExecutionStateStore
-import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState
-import edu.uci.ics.texera.web.{ComputingUnitMaster, SubscriptionManager, WebsocketInput}
-import edu.uci.ics.texera.workflow.WorkflowCompiler
+import org.apache.texera.web.model.websocket.request.WorkflowExecuteRequest
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.storage.ExecutionStateStore
+import org.apache.texera.web.storage.ExecutionStateStore.updateWorkflowState
+import org.apache.texera.web.{ComputingUnitMaster, SubscriptionManager, WebsocketInput}
+import org.apache.texera.workflow.WorkflowCompiler
 
 import java.net.URI
 import scala.collection.mutable
@@ -50,9 +48,6 @@ object WorkflowExecutionService {
       workflowId: WorkflowIdentity,
       computingUnitId: Int
   ): Option[ExecutionIdentity] = {
-    if (!UserSystemConfig.isUserSystemEnabled) {
-      return Some(DEFAULT_EXECUTION_ID)
-    }
     WorkflowExecutionsResource
       .getLatestExecutionID(workflowId.id.toInt, computingUnitId)
       .map(eid => new ExecutionIdentity(eid.longValue()))
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala
similarity index 78%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala
rename to amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala
index 1fee982fde9..aa593cdcc65 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala
+++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala
@@ -17,50 +17,53 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.google.protobuf.timestamp.Timestamp
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.ApplicationConfig
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
+import io.reactivex.rxjava3.disposables.{CompositeDisposable, Disposable}
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+import org.apache.texera.amber.config.ApplicationConfig
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.result.iceberg.OnIceberg
+import org.apache.texera.amber.core.virtualidentity.{
+  EmbeddedControlMessageIdentity,
+  ExecutionIdentity,
+  WorkflowIdentity
+}
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.engine.architecture.controller.ControllerConfig
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{
   COMPLETED,
   FAILED
 }
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   FaultToleranceConfig,
   StateRestoreConfig
 }
-import edu.uci.ics.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses}
-import edu.uci.ics.amber.core.virtualidentity.{
-  EmbeddedControlMessageIdentity,
-  ExecutionIdentity,
-  WorkflowIdentity
+import org.apache.texera.amber.error.ErrorUtils.{
+  getOperatorFromActorIdOpt,
+  getStackTraceWithAllCauses
 }
-import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
-import edu.uci.ics.texera.web.model.websocket.request.WorkflowExecuteRequest
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
-import edu.uci.ics.texera.web.service.WorkflowService.mkWorkflowStateId
-import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState
-import edu.uci.ics.texera.web.storage.{ExecutionStateStore, WorkflowStateStore}
-import edu.uci.ics.texera.web.{SubscriptionManager, WorkflowLifecycleManager}
-import edu.uci.ics.texera.workflow.LogicalPlan
-import io.reactivex.rxjava3.disposables.{CompositeDisposable, Disposable}
-import io.reactivex.rxjava3.subjects.BehaviorSubject
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.service.util.LargeBinaryManager
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
+import org.apache.texera.web.model.websocket.request.WorkflowExecuteRequest
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
+import org.apache.texera.web.service.WorkflowService.mkWorkflowStateId
+import org.apache.texera.web.storage.ExecutionStateStore.updateWorkflowState
+import org.apache.texera.web.storage.{ExecutionStateStore, WorkflowStateStore}
+import org.apache.texera.web.{SubscriptionManager, WorkflowLifecycleManager}
+import org.apache.texera.workflow.LogicalPlan
 import play.api.libs.json.Json
 
 import java.net.URI
 import java.time.Instant
 import java.util.concurrent.ConcurrentHashMap
 import scala.jdk.CollectionConverters.IterableHasAsScala
-import edu.uci.ics.amber.core.storage.result.iceberg.OnIceberg
-import edu.uci.ics.texera.config.UserSystemConfig
 
 object WorkflowService {
   private val workflowServiceMapping = new ConcurrentHashMap[String, WorkflowService]()
@@ -207,35 +210,32 @@ class WorkflowService(
       req.computingUnitId
     )
 
-    if (UserSystemConfig.isUserSystemEnabled) {
-      // enable only if we have mysql
-      if (ApplicationConfig.faultToleranceLogRootFolder.isDefined) {
-        val writeLocation = ApplicationConfig.faultToleranceLogRootFolder.get.resolve(
-          s"${workflowContext.workflowId}/${workflowContext.executionId}/"
-        )
-        ExecutionsMetadataPersistService.tryUpdateExistingExecution(workflowContext.executionId) {
-          execution => execution.setLogLocation(writeLocation.toString)
-        }
-        controllerConf = controllerConf.copy(faultToleranceConfOpt =
-          Some(FaultToleranceConfig(writeTo = writeLocation))
-        )
+    if (ApplicationConfig.faultToleranceLogRootFolder.isDefined) {
+      val writeLocation = ApplicationConfig.faultToleranceLogRootFolder.get.resolve(
+        s"${workflowContext.workflowId}/${workflowContext.executionId}/"
+      )
+      ExecutionsMetadataPersistService.tryUpdateExistingExecution(workflowContext.executionId) {
+        execution => execution.setLogLocation(writeLocation.toString)
       }
-      if (req.replayFromExecution.isDefined) {
-        val replayInfo = req.replayFromExecution.get
-        ExecutionsMetadataPersistService
-          .tryGetExistingExecution(ExecutionIdentity(replayInfo.eid))
-          .foreach { execution =>
-            val readLocation = new URI(execution.getLogLocation)
-            controllerConf = controllerConf.copy(stateRestoreConfOpt =
-              Some(
-                StateRestoreConfig(
-                  readFrom = readLocation,
-                  replayDestination = EmbeddedControlMessageIdentity(replayInfo.interaction)
-                )
+      controllerConf = controllerConf.copy(faultToleranceConfOpt =
+        Some(FaultToleranceConfig(writeTo = writeLocation))
+      )
+    }
+    if (req.replayFromExecution.isDefined) {
+      val replayInfo = req.replayFromExecution.get
+      ExecutionsMetadataPersistService
+        .tryGetExistingExecution(ExecutionIdentity(replayInfo.eid))
+        .foreach { execution =>
+          val readLocation = new URI(execution.getLogLocation)
+          controllerConf = controllerConf.copy(stateRestoreConfOpt =
+            Some(
+              StateRestoreConfig(
+                readFrom = readLocation,
+                replayDestination = EmbeddedControlMessageIdentity(replayInfo.interaction)
               )
             )
-          }
-      }
+          )
+        }
     }
 
     val executionStateStore = new ExecutionStateStore()
@@ -311,6 +311,7 @@ class WorkflowService(
     *  2. Clears URI references from the execution registry
     *  3. Safely clears all result and console message documents
     *  4. Expires Iceberg snapshots for runtime statistics
+    *  5. Deletes large binaries from MinIO
     *
     * @param eid The execution identity to clean up resources for
     */
@@ -347,6 +348,7 @@ class WorkflowService(
           logger.debug(s"Error processing document at $uri: ${error.getMessage}")
       }
     }
+    // Delete large binaries
+    LargeBinaryManager.deleteAllObjects()
   }
-
 }
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala
similarity index 82%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala
rename to amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala
index f3da931312a..946a189ae9f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala
+++ b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.storage
+package org.apache.texera.web.storage
 
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.StateTransferFunc
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.workflow.PhysicalOp
+import org.apache.texera.amber.operator.StateTransferFunc
 
 case class ExecutionReconfigurationStore(
     currentReconfigId: Option[String] = None,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala
similarity index 85%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala
rename to amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala
index deb4735b127..654acbbefd1 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala
+++ b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.storage
+package org.apache.texera.web.storage
 
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
-import edu.uci.ics.amber.engine.common.Utils.maptoStatusCode
-import edu.uci.ics.amber.engine.common.executionruntimestate.{
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState
+import org.apache.texera.amber.engine.common.Utils.maptoStatusCode
+import org.apache.texera.amber.engine.common.executionruntimestate.{
   ExecutionBreakpointStore,
   ExecutionConsoleStore,
   ExecutionMetadataStore,
   ExecutionStatsStore
 }
-import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService
+import org.apache.texera.web.service.ExecutionsMetadataPersistService
 
 import java.sql.Timestamp
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala
similarity index 93%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala
rename to amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala
index 4183ba4073c..eb49e97b96f 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala
+++ b/amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.storage
+package org.apache.texera.web.storage
 
-import edu.uci.ics.amber.engine.common.Utils.withLock
-import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent
 import io.reactivex.rxjava3.core.{Observable, Single}
 import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.subjects.BehaviorSubject
+import org.apache.texera.amber.engine.common.Utils.withLock
+import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent
 
 import java.util
 import java.util.concurrent.locks.ReentrantLock
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/WorkflowStateStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala
similarity index 90%
rename from core/amber/src/main/scala/edu/uci/ics/texera/web/storage/WorkflowStateStore.scala
rename to amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala
index 6d3e9b6fdf3..f207dfb85f4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/WorkflowStateStore.scala
+++ b/amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.storage
+package org.apache.texera.web.storage
 
-import edu.uci.ics.amber.core.storage.result.WorkflowResultStore
+import org.apache.texera.amber.core.storage.result.WorkflowResultStore
 
 // states that across executions.
 class WorkflowStateStore {
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala b/amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala
similarity index 89%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala
rename to amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala
index c41010641c5..5bbc9164b72 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala
+++ b/amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.compiler.model
+package org.apache.texera.workflow
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty}
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 case class LogicalLink(
     @JsonProperty("fromOpId") fromOpId: OperatorIdentity,
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala b/amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala
similarity index 91%
rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala
rename to amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala
index 358e428b32c..974d17f40a4 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala
+++ b/amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.workflow
+package org.apache.texera.workflow
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo
+import org.apache.texera.amber.core.storage.FileResolver
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
+import org.apache.texera.web.model.websocket.request.LogicalPlanPojo
 import org.jgrapht.graph.DirectedAcyclicGraph
 import org.jgrapht.util.SupplierUtil
 
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala b/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
similarity index 95%
rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala
rename to amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
index 2ffdd4ef109..50d07a98194 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala
+++ b/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.workflow
+package org.apache.texera.workflow
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.engine.architecture.controller.Workflow
-import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.engine.architecture.controller.Workflow
+import org.apache.texera.web.model.websocket.request.LogicalPlanPojo
 
 import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
diff --git a/core/amber/src/test/java/edu/uci/ics/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java b/amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java
similarity index 97%
rename from core/amber/src/test/java/edu/uci/ics/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java
rename to amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java
index ac76ccebf9d..a07410b1450 100644
--- a/core/amber/src/test/java/edu/uci/ics/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java
+++ b/amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.dataset;
+package org.apache.texera.web.resource.dashboard.user.dataset;
 
-import edu.uci.ics.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage;
-import edu.uci.ics.amber.core.storage.util.dataset.PhysicalFileNode;
+import org.apache.texera.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage;
+import org.apache.texera.amber.core.storage.util.dataset.PhysicalFileNode;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala
similarity index 98%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala
index 2926d8f5f97..45f0d1bcb80 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.breakpoint
+package org.apache.texera.amber.engine.architecture.breakpoint
 
-import akka.actor.ActorSystem
-import akka.event.LoggingAdapter
-import akka.testkit.{ImplicitSender, TestKit}
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.pekko.util.Timeout
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/TrivialControlSpec.scala
similarity index 83%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/TrivialControlSpec.scala
index b889f19f34b..f89b0a60ae5 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/TrivialControlSpec.scala
@@ -17,30 +17,30 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control
+package org.apache.texera.amber.engine.architecture.control
 
-import akka.actor.{ActorRef, ActorSystem, PoisonPill, Props}
-import akka.testkit.{TestKit, TestProbe}
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.{
+import org.apache.pekko.actor.{ActorRef, ActorSystem, PoisonPill, Props}
+import org.apache.pekko.testkit.{TestKit, TestProbe}
+import io.grpc.MethodDescriptor
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{
   GetActorRef,
   NetworkAck,
   NetworkMessage,
   RegisterActorRef
 }
-import edu.uci.ics.amber.engine.architecture.control.utils.TrivialControlTester
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{
+import org.apache.texera.amber.engine.architecture.control.utils.TrivialControlTester
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{
   IntResponse,
   ReturnInvocation,
   StringResponse
 }
-import edu.uci.ics.amber.engine.architecture.rpc.testerservice.RPCTesterGrpc._
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import io.grpc.MethodDescriptor
+import org.apache.texera.amber.engine.architecture.rpc.testerservice.RPCTesterGrpc._
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/ChainHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ChainHandler.scala
similarity index 85%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/ChainHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ChainHandler.scala
index c18d7ac0417..9e7eff617d9 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/ChainHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ChainHandler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 trait ChainHandler {
   this: TesterAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/CollectHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/CollectHandler.scala
similarity index 87%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/CollectHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/CollectHandler.scala
index 164eec853d3..f36ca3c2b7b 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/CollectHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/CollectHandler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 import scala.util.Random
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/ErrorHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ErrorHandler.scala
similarity index 84%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/ErrorHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ErrorHandler.scala
index d005de96247..a1e6b94d05e 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/ErrorHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ErrorHandler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 trait ErrorHandler {
   this: TesterAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/MultiCallHandler.scala
similarity index 81%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/MultiCallHandler.scala
index 9322d90a628..21400b83f2c 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/MultiCallHandler.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 trait MultiCallHandler {
   this: TesterAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/NestedHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/NestedHandler.scala
similarity index 86%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/NestedHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/NestedHandler.scala
index 0077e93f3dc..31aa70d4470 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/NestedHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/NestedHandler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 trait NestedHandler {
   this: TesterAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/PingPongHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/PingPongHandler.scala
similarity index 88%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/PingPongHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/PingPongHandler.scala
index e763134319c..5ea7bf298e7 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/PingPongHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/PingPongHandler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 trait PingPongHandler {
   this: TesterAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/RecursionHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/RecursionHandler.scala
similarity index 85%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/RecursionHandler.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/RecursionHandler.scala
index 06db84e480d..7d2b7a38e22 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/RecursionHandler.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/RecursionHandler.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns._
 
 trait RecursionHandler {
   this: TesterAsyncRPCHandlerInitializer =>
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala
similarity index 72%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala
index 55d5c423cd6..24033da6bbf 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext
-import edu.uci.ics.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc
-import edu.uci.ics.amber.engine.common.rpc.{AsyncRPCHandlerInitializer, AsyncRPCServer}
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext
+import org.apache.texera.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc
+import org.apache.texera.amber.engine.common.rpc.{AsyncRPCHandlerInitializer, AsyncRPCServer}
 
 class TesterAsyncRPCHandlerInitializer(
     val myID: ActorVirtualIdentity,
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TrivialControlTester.scala
similarity index 73%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TrivialControlTester.scala
index ab01f273277..e236ac760b7 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TrivialControlTester.scala
@@ -17,24 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.control.utils
+package org.apache.texera.amber.engine.architecture.control.utils
 
 import com.twitter.util.Future
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkAck
-import edu.uci.ics.amber.engine.architecture.common.{AmberProcessor, WorkflowActor}
-import edu.uci.ics.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient
-import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkOutputGateway
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext
-import edu.uci.ics.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc
-import edu.uci.ics.amber.engine.common.CheckpointState
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
-import edu.uci.ics.amber.engine.common.ambermessage.{
-  DirectControlMessagePayload,
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck
+import org.apache.texera.amber.engine.architecture.common.{AmberProcessor, WorkflowActor}
+import org.apache.texera.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient
+import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext
+import org.apache.texera.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc
+import org.apache.texera.amber.engine.common.CheckpointState
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize
+import org.apache.texera.amber.engine.common.ambermessage.{
   DataPayload,
+  DirectControlMessagePayload,
   WorkflowFIFOMessage
 }
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient
 
 object TrivialControlTester {
   class ControlTesterRPCClient(outputGateway: NetworkOutputGateway, actorId: ActorVirtualIdentity)
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/controller/ControllerSpec.scala
similarity index 98%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/controller/ControllerSpec.scala
index f5a52c822a9..f3f8ca5dd0d 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/controller/ControllerSpec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.controller
+package org.apache.texera.amber.engine.architecture.controller
 
-import akka.actor.{ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestKit}
-import akka.util.Timeout
-import edu.uci.ics.amber.clustering.SingleNodeListener
+import org.apache.pekko.actor.{ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.pekko.util.Timeout
+import org.apache.texera.amber.clustering.SingleNodeListener
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala
similarity index 89%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala
index c73fe378e1e..16791443541 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, TupleLike}
-import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, TupleLike}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala
similarity index 88%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala
index bd4642dcbf8..405d9247068 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
 import com.softwaremill.macwire.wire
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, TupleLike}
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
-import edu.uci.ics.amber.engine.common.ambermessage._
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, TupleLike}
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   ChannelIdentity,
   OperatorIdentity,
   PhysicalOpIdentity
 }
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
+import org.apache.texera.amber.engine.common.ambermessage._
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala
similarity index 91%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala
index 6abeebe5cc2..2f906f59732 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.messaginglayer
+package org.apache.texera.amber.engine.architecture.messaginglayer
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners.RangeBasedShufflePartitioner
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitioners.RangeBasedShufflePartitioner
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala
similarity index 80%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala
index 48c75c2172a..1ca0572dca6 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-//package edu.uci.ics.amber.engine.architecture.pythonworker
+//package org.apache.texera.amber.engine.architecture.pythonworker
 //
-//import akka.actor.{ActorRef, ActorSystem, Props}
-//import akka.testkit.{ImplicitSender, TestActorRef, TestKit}
-//import edu.uci.ics.amber.clustering.SingleNodeListener
-//import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.{NetworkAck, NetworkMessage}
-//import edu.uci.ics.amber.engine.architecture.pythonworker.promisehandlers.InitializeOperatorLogicHandler.InitializeOperatorLogic
-//import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
-//import edu.uci.ics.amber.engine.architecture.worker.controlcommands.LinkOrdinal
-//import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AddPartitioningHandler.AddPartitioning
-//import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.OpenOperatorHandler.OpenOperator
-//import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.UpdateInputLinkingHandler.UpdateInputLinking
-//import edu.uci.ics.amber.engine.common.Constants
-//import edu.uci.ics.amber.engine.common.ambermessage.{
+//import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+//import org.apache.pekko.testkit.{ImplicitSender, TestActorRef, TestKit}
+//import org.apache.texera.amber.clustering.SingleNodeListener
+//import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{NetworkAck, NetworkMessage}
+//import org.apache.texera.amber.engine.architecture.pythonworker.promisehandlers.InitializeOperatorLogicHandler.InitializeOperatorLogic
+//import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
+//import org.apache.texera.amber.engine.architecture.worker.controlcommands.LinkOrdinal
+//import org.apache.texera.amber.engine.architecture.worker.promisehandlers.AddPartitioningHandler.AddPartitioning
+//import org.apache.texera.amber.engine.architecture.worker.promisehandlers.OpenOperatorHandler.OpenOperator
+//import org.apache.texera.amber.engine.architecture.worker.promisehandlers.UpdateInputLinkingHandler.UpdateInputLinking
+//import org.apache.texera.amber.engine.common.Constants
+//import org.apache.texera.amber.engine.common.ambermessage.{
 //  ChannelIdentity,
 //  ControlPayload,
 //  DataFrame,
@@ -38,17 +38,17 @@
 //  EndOfUpstream,
 //  WorkflowFIFOMessage
 //}
-//import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation}
-//import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-//import edu.uci.ics.amber.core.virtualidentity.{
+//import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation}
+//import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+//import org.apache.texera.amber.core.virtualidentity.{
 //  ActorVirtualIdentity,
 //  PhysicalLink,
 //  PhysicalLink,
 //  OperatorIdentity
 //}
-//import edu.uci.ics.amber.engine.e2e.TestOperators
-//import edu.uci.ics.texera.workflow.common.tuple.Tuple
-//import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema}
+//import org.apache.texera.amber.engine.e2e.TestOperators
+//import org.apache.texera.workflow.common.tuple.Tuple
+//import org.apache.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema}
 //import org.scalamock.scalatest.MockFactory
 //import org.scalatest.BeforeAndAfterAll
 //import org.scalatest.flatspec.AnyFlatSpecLike
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala
similarity index 95%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala
index c20662e36ca..07c1758d9e8 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala
@@ -17,14 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
-
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.texera.workflow.LogicalLink
+package org.apache.texera.amber.engine.architecture.scheduling
+
+import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext}
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.workflow.LogicalLink
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala
similarity index 89%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala
index 1700c26e9ff..d1b2595cbb5 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala
@@ -17,29 +17,29 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
-
-import edu.uci.ics.amber.core.storage.model.{BufferedItemWriter, VirtualDocument}
-import edu.uci.ics.amber.core.storage.result.ResultSchema
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies.{
+package org.apache.texera.amber.engine.architecture.scheduling
+
+import org.apache.texera.amber.core.storage.model.{BufferedItemWriter, VirtualDocument}
+import org.apache.texera.amber.core.storage.result.ResultSchema
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.{
   DefaultResourceAllocator,
   ExecutionClusterInfo
 }
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.operator.aggregate.{AggregateOpDesc, AggregationFunction}
-import edu.uci.ics.amber.operator.keywordSearch.KeywordSearchOpDesc
-import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos._
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos._
-import edu.uci.ics.texera.workflow.LogicalLink
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.amber.operator.aggregate.{AggregateOpDesc, AggregationFunction}
+import org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpDesc
+import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos._
+import org.apache.texera.dao.jooq.generated.tables.pojos._
+import org.apache.texera.workflow.LogicalLink
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala
similarity index 94%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala
index 9143eb23a62..e720b9c6cb5 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.scheduling
-
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.operator.split.SplitOpDesc
-import edu.uci.ics.amber.operator.udf.python.{DualInputPortsPythonUDFOpDescV2, PythonUDFOpDescV2}
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.texera.workflow.LogicalLink
+package org.apache.texera.amber.engine.architecture.scheduling
+
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext}
+import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.amber.operator.split.SplitOpDesc
+import org.apache.texera.amber.operator.udf.python.{
+  DualInputPortsPythonUDFOpDescV2,
+  PythonUDFOpDescV2
+}
+import org.apache.texera.workflow.LogicalLink
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DPThreadSpec.scala
similarity index 89%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DPThreadSpec.scala
index 052c8615508..d8b5d57d638 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DPThreadSpec.scala
@@ -17,28 +17,31 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike}
-import edu.uci.ics.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord}
-import edu.uci.ics.amber.engine.architecture.messaginglayer.WorkerTimerService
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord}
+import org.apache.texera.amber.engine.architecture.messaginglayer.WorkerTimerService
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
   METHOD_PAUSE_WORKER,
   METHOD_RESUME_WORKER
 }
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   DPInputQueueElement,
   FIFOMessageElement,
   TimerBasedControlElement
 }
-import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.virtualidentity.util.SELF
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorSpec.scala
similarity index 84%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorSpec.scala
index a675fc02c6b..0f4840f9653 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorSpec.scala
@@ -17,42 +17,36 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike}
-import edu.uci.ics.amber.core.workflow.WorkflowContext.DEFAULT_WORKFLOW_ID
-import edu.uci.ics.amber.engine.architecture.messaginglayer.WorkerTimerService
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike}
+import org.apache.texera.amber.core.virtualidentity._
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.workflow.WorkflowContext.DEFAULT_WORKFLOW_ID
+import org.apache.texera.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord}
+import org.apache.texera.amber.engine.architecture.messaginglayer.WorkerTimerService
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AsyncRPCContext,
   EmbeddedControlMessage,
   EmbeddedControlMessageType,
   EmptyRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
   METHOD_END_CHANNEL,
   METHOD_FLUSH_NETWORK_BUFFER,
   METHOD_OPEN_EXECUTOR
 }
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   DPInputQueueElement,
   MainThreadDelegateMessage
 }
-import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.READY
-import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.util.VirtualIdentityUtils
-import edu.uci.ics.amber.core.virtualidentity.{
-  ActorVirtualIdentity,
-  ChannelIdentity,
-  EmbeddedControlMessageIdentity,
-  OperatorIdentity,
-  PhysicalOpIdentity
-}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord}
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.READY
+import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage}
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.util.VirtualIdentityUtils
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/WorkerSpec.scala
similarity index 85%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/WorkerSpec.scala
index f9691301650..890fe97b852 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/WorkerSpec.scala
@@ -17,34 +17,38 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.architecture.worker
+package org.apache.texera.amber.engine.architecture.worker
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestActorRef, TestKit}
-import edu.uci.ics.amber.clustering.SingleNodeListener
-import edu.uci.ics.amber.core.executor.{OpExecWithClassName, OperatorExecutor}
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestActorRef, TestKit}
+import org.apache.texera.amber.clustering.SingleNodeListener
+import org.apache.texera.amber.core.executor.{OpExecWithClassName, OperatorExecutor}
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   ChannelIdentity,
   OperatorIdentity,
   PhysicalOpIdentity
 }
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity}
-import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkMessage
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc._
-import edu.uci.ics.amber.engine.architecture.scheduling.config.WorkerConfig
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{
+import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands._
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc._
+import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{
   DPInputQueueElement,
   MainThreadDelegateMessage,
   WorkerReplayInitialization
 }
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, DataPayload, WorkflowFIFOMessage}
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.ambermessage.{
+  DataFrame,
+  DataPayload,
+  WorkflowFIFOMessage
+}
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
@@ -193,7 +197,9 @@ class WorkerSpec
       METHOD_INITIALIZE_EXECUTOR,
       InitializeExecutorRequest(
         1,
-        OpExecWithClassName("edu.uci.ics.amber.engine.architecture.worker.DummyOperatorExecutor"),
+        OpExecWithClassName(
+          "org.apache.texera.amber.engine.architecture.worker.DummyOperatorExecutor"
+        ),
         isSource = false
       ),
       AsyncRPCContext(CONTROLLER, identifier1),
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/BatchSizePropagationSpec.scala
similarity index 92%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/BatchSizePropagationSpec.scala
index e3a2a82cc46..e9b830bdfdc 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/BatchSizePropagationSpec.scala
@@ -17,21 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.e2e
-
-import akka.actor.{ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestKit}
-import akka.util.Timeout
-import edu.uci.ics.amber.clustering.SingleNodeListener
-import edu.uci.ics.amber.core.workflow.{WorkflowContext, WorkflowSettings}
-import edu.uci.ics.amber.engine.architecture.controller._
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings._
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.operator.aggregate.AggregationFunction
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.texera.workflow.LogicalLink
+package org.apache.texera.amber.engine.e2e
+
+import org.apache.pekko.actor.{ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.pekko.util.Timeout
+import org.apache.texera.amber.clustering.SingleNodeListener
+import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext, WorkflowSettings}
+import org.apache.texera.amber.engine.architecture.controller._
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings._
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
+import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.amber.operator.aggregate.AggregationFunction
+import org.apache.texera.workflow.LogicalLink
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/DataProcessingSpec.scala
similarity index 79%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/DataProcessingSpec.scala
index 2cf6e53febd..b341c1a8f67 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/DataProcessingSpec.scala
@@ -17,31 +17,35 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.e2e
+package org.apache.texera.amber.engine.e2e
 
-import akka.actor.{ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestKit}
-import akka.util.Timeout
-import ch.vorburger.mariadb4j.DB
+import org.apache.pekko.actor.{ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.pekko.util.Timeout
 import com.twitter.util.{Await, Duration, Promise}
-import edu.uci.ics.amber.clustering.SingleNodeListener
-import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.storage.result.ExecutionResourcesMapping
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple}
-import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.controller._
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmptyRequest
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.operator.aggregate.AggregationFunction
-import edu.uci.ics.texera.workflow.LogicalLink
+import org.apache.texera.amber.clustering.SingleNodeListener
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.model.VirtualDocument
+import org.apache.texera.amber.core.tuple.{AttributeType, Tuple}
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.controller._
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmptyRequest
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.e2e.TestUtils.{
+  buildWorkflow,
+  cleanupWorkflowExecutionData,
+  initiateTexeraDBForTestCases,
+  setUpWorkflowExecutionData
+}
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.amber.operator.aggregate.AggregationFunction
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource.getResultUriByLogicalPortId
+import org.apache.texera.workflow.LogicalLink
 import org.scalatest.flatspec.AnyFlatSpecLike
-import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Outcome, Retries}
 
 import scala.concurrent.duration.DurationInt
 
@@ -50,18 +54,35 @@ class DataProcessingSpec
     with ImplicitSender
     with AnyFlatSpecLike
     with BeforeAndAfterAll
-    with BeforeAndAfterEach {
+    with BeforeAndAfterEach
+    with Retries {
+
+  /**
+    * This block retries each test once if it fails.
+    * In the CI environment, there is a chance that executeWorkflow does not receive "COMPLETED" status.
+    * Until we find the root cause of this issue, we use a retry mechanism here to stablize CI runs.
+    */
+  override def withFixture(test: NoArgTest): Outcome =
+    withRetry { super.withFixture(test) }
 
   implicit val timeout: Timeout = Timeout(5.seconds)
 
-  var inMemoryMySQLInstance: Option[DB] = None
   val workflowContext: WorkflowContext = new WorkflowContext()
 
+  override protected def beforeEach(): Unit = {
+    setUpWorkflowExecutionData()
+  }
+
+  override protected def afterEach(): Unit = {
+    cleanupWorkflowExecutionData()
+  }
+
   override def beforeAll(): Unit = {
     system.actorOf(Props[SingleNodeListener](), "cluster-info")
     // These test cases access postgres in CI, but occasionally the jdbc driver cannot be found during CI run.
     // Explicitly load the JDBC driver to avoid flaky CI failures.
     Class.forName("org.postgresql.Driver")
+    initiateTexeraDBForTestCases()
   }
 
   override def afterAll(): Unit = {
@@ -88,30 +109,21 @@ class DataProcessingSpec
         if (evt.state == COMPLETED) {
           results = workflow.logicalPlan.getTerminalOperatorIds
             .filter(terminalOpId => {
-              val uri = VFSURIFactory.createResultURI(
-                workflowContext.workflowId,
+              val uri = getResultUriByLogicalPortId(
                 workflowContext.executionId,
-                GlobalPortIdentity(
-                  PhysicalOpIdentity(logicalOpId = terminalOpId, layerName = "main"),
-                  PortIdentity()
-                )
+                terminalOpId,
+                PortIdentity()
               )
-              // expecting the first output port only.
-              ExecutionResourcesMapping
-                .getResourceURIs(workflowContext.executionId)
-                .contains(uri)
+              uri.nonEmpty
             })
             .map(terminalOpId => {
               //TODO: remove the delay after fixing the issue of reporting "completed" status too early.
               Thread.sleep(1000)
-              val uri = VFSURIFactory.createResultURI(
-                workflowContext.workflowId,
+              val uri = getResultUriByLogicalPortId(
                 workflowContext.executionId,
-                GlobalPortIdentity(
-                  PhysicalOpIdentity(logicalOpId = terminalOpId, layerName = "main"),
-                  PortIdentity()
-                )
-              )
+                terminalOpId,
+                PortIdentity()
+              ).get
               terminalOpId -> DocumentFactory
                 .openDocument(uri)
                 ._1
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/PauseSpec.scala
similarity index 64%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/PauseSpec.scala
index bd4164798de..921e2de2bd1 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/PauseSpec.scala
@@ -17,24 +17,32 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.e2e
+package org.apache.texera.amber.engine.e2e
 
-import akka.actor.{ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestKit}
-import akka.util.Timeout
-import com.twitter.util.{Await, Promise}
+import org.apache.pekko.actor.{ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.pekko.util.Timeout
+import com.twitter.util.{Await, Duration, Promise}
 import com.typesafe.scalalogging.Logger
-import edu.uci.ics.amber.clustering.SingleNodeListener
-import edu.uci.ics.amber.core.workflow.{PortIdentity, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.controller.{ControllerConfig, ExecutionStateUpdate}
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmptyRequest
-import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.engine.common.client.AmberClient
-import edu.uci.ics.amber.operator.{LogicalOp, TestOperators}
-import edu.uci.ics.texera.workflow.LogicalLink
-import org.scalatest.BeforeAndAfterAll
+import org.apache.texera.amber.clustering.SingleNodeListener
+import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.controller.{
+  ControllerConfig,
+  ExecutionStateUpdate
+}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmptyRequest
+import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.client.AmberClient
+import org.apache.texera.amber.engine.e2e.TestUtils.{
+  cleanupWorkflowExecutionData,
+  initiateTexeraDBForTestCases,
+  setUpWorkflowExecutionData
+}
+import org.apache.texera.amber.operator.{LogicalOp, TestOperators}
+import org.apache.texera.workflow.LogicalLink
 import org.scalatest.flatspec.AnyFlatSpecLike
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Outcome, Retries}
 
 import scala.concurrent.duration._
 
@@ -42,17 +50,36 @@ class PauseSpec
     extends TestKit(ActorSystem("PauseSpec", AmberRuntime.akkaConfig))
     with ImplicitSender
     with AnyFlatSpecLike
-    with BeforeAndAfterAll {
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach
+    with Retries {
+
+  /**
+    * This block retries each test once if it fails.
+    * In the CI environment, there is a chance that shouldPause does not receive "COMPLETED" status.
+    * Until we find the root cause of this issue, we use a retry mechanism here to stablize CI runs.
+    */
+  override def withFixture(test: NoArgTest): Outcome =
+    withRetry { super.withFixture(test) }
 
   implicit val timeout: Timeout = Timeout(5.seconds)
 
   val logger = Logger("PauseSpecLogger")
 
+  override protected def beforeEach(): Unit = {
+    setUpWorkflowExecutionData()
+  }
+
+  override protected def afterEach(): Unit = {
+    cleanupWorkflowExecutionData()
+  }
+
   override def beforeAll(): Unit = {
     system.actorOf(Props[SingleNodeListener](), "cluster-info")
     // These test cases access postgres in CI, but occasionally the jdbc driver cannot be found during CI run.
     // Explicitly load the JDBC driver to avoid flaky CI failures.
     Class.forName("org.postgresql.Driver")
+    initiateTexeraDBForTestCases()
   }
 
   override def afterAll(): Unit = {
@@ -88,7 +115,7 @@ class PauseSpec
     Await.result(client.controllerInterface.pauseWorkflow(EmptyRequest(), ()))
     Thread.sleep(4000)
     Await.result(client.controllerInterface.resumeWorkflow(EmptyRequest(), ()))
-    Await.result(completion)
+    Await.result(completion, Duration.fromMinutes(1))
   }
 
   "Engine" should "be able to pause csv workflow" in {
diff --git a/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala
new file mode 100644
index 00000000000..e7d729c5e23
--- /dev/null
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.engine.e2e
+
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.core.workflow.WorkflowContext
+import org.apache.texera.amber.engine.architecture.controller.Workflow
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{
+  UserDao,
+  WorkflowDao,
+  WorkflowExecutionsDao,
+  WorkflowVersionDao
+}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{
+  User,
+  WorkflowExecutions,
+  WorkflowVersion,
+  Workflow => WorkflowPojo
+}
+import org.apache.texera.web.model.websocket.request.LogicalPlanPojo
+import org.apache.texera.workflow.{LogicalLink, WorkflowCompiler}
+
+object TestUtils {
+
+  def buildWorkflow(
+      operators: List[LogicalOp],
+      links: List[LogicalLink],
+      context: WorkflowContext
+  ): Workflow = {
+    val workflowCompiler = new WorkflowCompiler(
+      context
+    )
+    workflowCompiler.compile(
+      LogicalPlanPojo(operators, links, List(), List())
+    )
+  }
+
+  /**
+    * If a test case accesses the user system through singleton resources that cache the DSLContext (e.g., executes a
+    * workflow, which accesses WorkflowExecutionsResource), we use a separate texera_db specifically for such test cases.
+    * Note such test cases need to clean up the database at the end of running each test case.
+    */
+  def initiateTexeraDBForTestCases(): Unit = {
+    SqlServer.initConnection(
+      StorageConfig.jdbcUrlForTestCases,
+      StorageConfig.jdbcUsername,
+      StorageConfig.jdbcPassword
+    )
+  }
+
+  val testUser: User = {
+    val user = new User
+    user.setUid(Integer.valueOf(1))
+    user.setName("test_user")
+    user.setRole(UserRoleEnum.ADMIN)
+    user.setPassword("123")
+    user.setEmail("test_user@test.com")
+    user
+  }
+
+  val testWorkflowEntry: WorkflowPojo = {
+    val workflow = new WorkflowPojo
+    workflow.setName("test workflow")
+    workflow.setWid(Integer.valueOf(1))
+    workflow.setContent("test workflow content")
+    workflow.setDescription("test description")
+    workflow
+  }
+
+  val testWorkflowVersionEntry: WorkflowVersion = {
+    val workflowVersion = new WorkflowVersion
+    workflowVersion.setWid(Integer.valueOf(1))
+    workflowVersion.setVid(Integer.valueOf(1))
+    workflowVersion.setContent("test version content")
+    workflowVersion
+  }
+
+  val testWorkflowExecutionEntry: WorkflowExecutions = {
+    val workflowExecution = new WorkflowExecutions
+    workflowExecution.setEid(Integer.valueOf(1))
+    workflowExecution.setVid(Integer.valueOf(1))
+    workflowExecution.setUid(Integer.valueOf(1))
+    workflowExecution.setStatus(3.toByte)
+    workflowExecution.setEnvironmentVersion("test engine")
+    workflowExecution
+  }
+
+  def setUpWorkflowExecutionData(): Unit = {
+    val dslConfig = SqlServer.getInstance().context.configuration()
+    val userDao = new UserDao(dslConfig)
+    val workflowDao = new WorkflowDao(dslConfig)
+    val workflowExecutionsDao = new WorkflowExecutionsDao(dslConfig)
+    val workflowVersionDao = new WorkflowVersionDao(dslConfig)
+    userDao.insert(testUser)
+    workflowDao.insert(testWorkflowEntry)
+    workflowVersionDao.insert(testWorkflowVersionEntry)
+    workflowExecutionsDao.insert(testWorkflowExecutionEntry)
+  }
+
+  def cleanupWorkflowExecutionData(): Unit = {
+    val dslConfig = SqlServer.getInstance().context.configuration()
+    val userDao = new UserDao(dslConfig)
+    val workflowDao = new WorkflowDao(dslConfig)
+    val workflowExecutionsDao = new WorkflowExecutionsDao(dslConfig)
+    val workflowVersionDao = new WorkflowVersionDao(dslConfig)
+    workflowExecutionsDao.deleteById(1)
+    workflowVersionDao.deleteById(1)
+    workflowDao.deleteById(1)
+    userDao.deleteById(1)
+  }
+
+}
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/CheckpointSpec.scala
similarity index 84%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/CheckpointSpec.scala
index daabe6a9947..ee5a0b9a609 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/CheckpointSpec.scala
@@ -17,20 +17,23 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.faulttolerance
+package org.apache.texera.amber.engine.faulttolerance
 
-import akka.actor.{ActorSystem, Props}
-import edu.uci.ics.amber.clustering.SingleNodeListener
-import edu.uci.ics.amber.core.workflow.{PortIdentity, WorkflowContext}
-import edu.uci.ics.amber.engine.architecture.controller.{ControllerConfig, ControllerProcessor}
-import edu.uci.ics.amber.engine.architecture.worker.DataProcessor
-import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement
-import edu.uci.ics.amber.engine.common.SerializedState.{CP_STATE_KEY, DP_STATE_KEY}
-import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF}
-import edu.uci.ics.amber.engine.common.{AmberRuntime, CheckpointState}
-import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.texera.workflow.LogicalLink
+import org.apache.pekko.actor.{ActorSystem, Props}
+import org.apache.texera.amber.clustering.SingleNodeListener
+import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext}
+import org.apache.texera.amber.engine.architecture.controller.{
+  ControllerConfig,
+  ControllerProcessor
+}
+import org.apache.texera.amber.engine.architecture.worker.DataProcessor
+import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement
+import org.apache.texera.amber.engine.common.SerializedState.{CP_STATE_KEY, DP_STATE_KEY}
+import org.apache.texera.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF}
+import org.apache.texera.amber.engine.common.{AmberRuntime, CheckpointState}
+import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.workflow.LogicalLink
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/LoggingSpec.scala
similarity index 78%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/LoggingSpec.scala
index 4f563a7dc00..87e3ca148ee 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/LoggingSpec.scala
@@ -17,41 +17,41 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.faulttolerance
+package org.apache.texera.amber.engine.faulttolerance
 
-import akka.actor.ActorSystem
-import akka.testkit.{ImplicitSender, TestKit}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, TupleLike}
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, TupleLike}
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   ChannelIdentity,
   OperatorIdentity,
   PhysicalOpIdentity
 }
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity}
-import edu.uci.ics.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord}
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{
+import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord}
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
   AddPartitioningRequest,
   AsyncRPCContext,
   EmptyRequest
 }
-import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_WORKER_EXECUTION_COMPLETED
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
+import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_WORKER_EXECUTION_COMPLETED
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{
   METHOD_ADD_PARTITIONING,
   METHOD_PAUSE_WORKER,
   METHOD_RESUME_WORKER,
   METHOD_START_WORKER
 }
-import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
-import edu.uci.ics.amber.engine.common.AmberRuntime
-import edu.uci.ics.amber.engine.common.ambermessage.{
+import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning
+import org.apache.texera.amber.engine.common.AmberRuntime
+import org.apache.texera.amber.engine.common.ambermessage.{
   DataFrame,
   WorkflowFIFOMessage,
   WorkflowFIFOMessagePayload
 }
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF}
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF}
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.TimeLimitedTests
 import org.scalatest.flatspec.AnyFlatSpecLike
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/ReplaySpec.scala
similarity index 81%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala
rename to amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/ReplaySpec.scala
index 819bea54ced..57c97d4d444 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala
+++ b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/ReplaySpec.scala
@@ -17,25 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.faulttolerance
+package org.apache.texera.amber.engine.faulttolerance
 
-import akka.actor.ActorSystem
-import akka.testkit.{ImplicitSender, TestKit}
-import edu.uci.ics.amber.engine.architecture.logreplay.{
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.{ImplicitSender, TestKit}
+import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.logreplay.{
   ProcessingStep,
   ReplayLogManagerImpl,
   ReplayLogRecord,
   ReplayOrderEnforcer
 }
-import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkInputGateway
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest}
-import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_WORKER
-import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage
-import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
-import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordReader
-import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER
-import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
+import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkInputGateway
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  AsyncRPCContext,
+  EmptyRequest
+}
+import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_WORKER
+import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
+import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage
+import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordReader
+import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpecLike
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala
similarity index 95%
rename from core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala
rename to amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala
index ae965d3962e..74a68ee65ea 100644
--- a/core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.file
-
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.jooq.generated.Tables.{USER, WORKFLOW, WORKFLOW_OF_PROJECT}
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.UserDao
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Project, User, Workflow}
-import edu.uci.ics.texera.web.resource.dashboard.DashboardResource.SearchQueryParams
-import edu.uci.ics.texera.web.resource.dashboard.user.project.ProjectResource
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource
-import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource.{
+package org.apache.texera.web.resource.dashboard.file
+
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.Tables.{USER, WORKFLOW, WORKFLOW_OF_PROJECT}
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Project, User, Workflow}
+import org.apache.texera.web.resource.dashboard.DashboardResource.SearchQueryParams
+import org.apache.texera.web.resource.dashboard.user.project.ProjectResource
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource
+import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource.{
   DashboardWorkflow,
   WorkflowIDs
 }
-import edu.uci.ics.texera.web.resource.dashboard.{DashboardResource, FulltextSearchQueryUtils}
+import org.apache.texera.web.resource.dashboard.{DashboardResource, FulltextSearchQueryUtils}
 import org.jooq.Condition
 import org.jooq.impl.DSL.noCondition
 import org.scalatest.flatspec.AnyFlatSpec
@@ -40,7 +40,7 @@ import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 
 import java.sql.Timestamp
 import java.text.{ParseException, SimpleDateFormat}
-import java.time.{OffsetDateTime, ZoneOffset, Duration}
+import java.time.{Duration, OffsetDateTime, ZoneOffset}
 import java.util
 import java.util.Collections
 import java.util.concurrent.TimeUnit
@@ -300,6 +300,23 @@ class WorkflowResourceSpec
     )
   }
 
+  "WorkflowResource /owner_name" should "return owner name as plain text" in {
+    workflowResource.persistWorkflow(testWorkflow1, sessionUser1)
+
+    val workflows = workflowResource.retrieveWorkflowsBySessionUser(sessionUser1)
+    assert(workflows.nonEmpty)
+
+    val wid =
+      workflows
+        .find(_.workflow.getName == testWorkflow1.getName)
+        .map(_.workflow.getWid)
+        .getOrElse(workflows.head.workflow.getWid)
+
+    val ownerName = workflowResource.getOwnerName(wid)
+
+    assert(ownerName == testUser.getName)
+  }
+
   "/search API " should "be able to search for workflows in different columns in Workflow table" in {
     // testWorkflow1: {name: test_name, descrption: test_description, content: test_content}
     // search "test_name" or "test_description" or "test_content" should return testWorkflow1
diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResourceSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResourceSpec.scala
similarity index 95%
rename from core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResourceSpec.scala
rename to amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResourceSpec.scala
index 4dbfcc45873..1bd7fcdf6c1 100644
--- a/core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResourceSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResourceSpec.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.workflow
+package org.apache.texera.web.resource.dashboard.user.workflow
 
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.Tables._
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.Tables._
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   UserDao,
   WorkflowDao,
   WorkflowExecutionsDao,
   WorkflowVersionDao
 }
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{
+import org.apache.texera.dao.jooq.generated.tables.pojos.{
   User,
   Workflow,
   WorkflowExecutions,
diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala
similarity index 94%
rename from core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala
rename to amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala
index 4d7e856fc3f..ecf704f663b 100644
--- a/core/amber/src/test/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.resource.dashboard.user.workflow
+package org.apache.texera.web.resource.dashboard.user.workflow
 
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.Tables
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Workflow, WorkflowVersion}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.Tables
+import org.apache.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Workflow, WorkflowVersion}
+import org.jooq.impl.DSL
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
-import org.jooq.impl.DSL
 
 import java.sql.Timestamp
 import java.util.UUID
diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/web/service/ExecutionConsoleServiceSpec.scala b/amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala
similarity index 95%
rename from core/amber/src/test/scala/edu/uci/ics/texera/web/service/ExecutionConsoleServiceSpec.scala
rename to amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala
index 6b3b412210c..d4753984cf1 100644
--- a/core/amber/src/test/scala/edu/uci/ics/texera/web/service/ExecutionConsoleServiceSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala
@@ -17,12 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
 import com.google.protobuf.timestamp.Timestamp
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessage
-import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType
-import edu.uci.ics.amber.engine.common.executionruntimestate.ExecutionConsoleStore
+import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
+  ConsoleMessage,
+  ConsoleMessageType
+}
+import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionConsoleStore
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/web/service/ExecutionResultServiceSpec.scala b/amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala
similarity index 99%
rename from core/amber/src/test/scala/edu/uci/ics/texera/web/service/ExecutionResultServiceSpec.scala
rename to amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala
index 7de02675a6e..d9b3f60e6ff 100644
--- a/core/amber/src/test/scala/edu/uci/ics/texera/web/service/ExecutionResultServiceSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.web.service
+package org.apache.texera.web.service
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala b/amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala
similarity index 94%
rename from core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala
rename to amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala
index 3b8a2c652ac..a5837bed8b8 100644
--- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala
+++ b/amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.common.storage
+package org.apache.texera.amber.engine.common.storage
 
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.storage.model.ReadonlyVirtualDocument
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.storage.model.ReadonlyVirtualDocument
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
diff --git a/core/scripts/.htaccess b/bin/.htaccess
similarity index 100%
rename from core/scripts/.htaccess
rename to bin/.htaccess
diff --git a/deployment/README.md b/bin/README.md
similarity index 55%
rename from deployment/README.md
rename to bin/README.md
index 60ca74eea21..3b13961296a 100644
--- a/deployment/README.md
+++ b/bin/README.md
@@ -2,22 +2,20 @@
 
 This directory contains Dockerfiles and configuration files for building and deploying Texera's microservices.
 
-## Dockerfiles and Images
+## Dockerfiles
 
 This directory includes several Dockerfiles, such as `file-service.dockerfile` and `computing-unit-master.dockerfile`. Each Dockerfile builds a specific Texera microservice. All Dockerfiles must be built from the `texera` project root as the Docker build context.
 
-For example, to build the image using `texera-web-application.dockerfile`, run the following command from the `deployment` directory:
+For example, to build the image using `texera-web-application.dockerfile`, run the following command **from the project root**:
 
 ```bash
-docker build -f texera-web-application.dockerfile -t texera/texera-web-application:test ..
-``` 
+docker build -f bin/texera-web-application.dockerfile -t your-repo/texera-web-application:test .
+```
 
-You can also find prebuilt images published by the Texera team on the [Texera DockerHub Repository](https://hub.docker.com/repositories/texera).
-
-## Deployment Based on Docker Images
+Two shell scripts, `build-images.sh` and `build-services.sh` are included for building platform-dependent images conveniently. 
 
-Subdirectories like `single-node` contain configuration files for deploying Texera using the above Docker images.
+You can also find prebuilt images published by the Texera team on the [Texera DockerHub Repository](https://hub.docker.com/repositories/texera).
 
-### `single-node` architecture
+## Deployment using images
 
-The `single-node` directory includes the necessary files for deploying Texera on a single machine using Docker Compose.
+Subdirectories `single-node` and `k8s` contain configuration files for deploying Texera using the above Docker images.
\ No newline at end of file
diff --git a/bin/access-control-service.dockerfile b/bin/access-control-service.dockerfile
new file mode 100644
index 00000000000..41b328f78e9
--- /dev/null
+++ b/bin/access-control-service.dockerfile
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
+
+# Set working directory
+WORKDIR /texera
+
+# Copy modules for building the service
+COPY common/ common/
+COPY access-control-service/ access-control-service/
+COPY project/ project/
+COPY build.sbt build.sbt
+
+# Update system and install dependencies
+RUN apt-get update && apt-get install -y \
+    netcat \
+    unzip \
+    libpq-dev \
+    && apt-get clean
+
+# Add .git for runtime calls to jgit from OPversion
+COPY .git .git
+
+RUN sbt clean AccessControlService/dist
+
+# Unzip the texera binary
+RUN unzip access-control-service/target/universal/access-control-service-*.zip -d target/
+
+FROM eclipse-temurin:11-jre-jammy AS runtime
+
+WORKDIR /texera
+
+COPY --from=build /texera/.git /texera/.git
+# Copy the built texera binary from the build phase
+COPY --from=build /texera/target/access-control-service* /texera/
+# Copy resources directories from build phase
+COPY --from=build /texera/access-control-service/src/main/resources /texera/access-control-service/src/main/resources
+
+CMD ["bin/access-control-service"]
+
+EXPOSE 9096
\ No newline at end of file
diff --git a/core/scripts/add-computing-unit-worker.sh b/bin/add-computing-unit-worker.sh
similarity index 79%
rename from core/scripts/add-computing-unit-worker.sh
rename to bin/add-computing-unit-worker.sh
index 10c7265383a..8519c4e650f 100755
--- a/core/scripts/add-computing-unit-worker.sh
+++ b/bin/add-computing-unit-worker.sh
@@ -15,10 +15,14 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd amber
-if [ ! -z $1 ]
-then 
-    target/texera-0.1-SNAPSHOT/bin/computing-unit-worker --serverAddr $1
-else
+(
+  cd amber || { echo "Error: amber directory not found"; exit 1; }
+
+  if [ -n "$1" ]; then
+    echo "Starting worker with server address: $1"
+    target/texera-0.1-SNAPSHOT/bin/computing-unit-worker --serverAddr "$1"
+  else
+    echo "Starting worker without explicit server address"
     target/texera-0.1-SNAPSHOT/bin/computing-unit-worker
-fi
+  fi
+)
\ No newline at end of file
diff --git a/deployment/build-all.sh b/bin/build-images.sh
similarity index 59%
rename from deployment/build-all.sh
rename to bin/build-images.sh
index 3ea069afc64..8c55656db97 100755
--- a/deployment/build-all.sh
+++ b/bin/build-images.sh
@@ -15,19 +15,62 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-
 set -e
 
-# Prompt for base tag
+# Default values
 DEFAULT_TAG="latest"
-read -p "Enter the base tag for the images [${DEFAULT_TAG}]: " BASE_TAG
-BASE_TAG=${BASE_TAG:-$DEFAULT_TAG}
-
-# Prompt for which services to build
 DEFAULT_SERVICES="*"
-read -p "Enter services to build (comma-separated, '*' for all) [${DEFAULT_SERVICES}]: " SERVICES_INPUT
-SERVICES_INPUT=${SERVICES_INPUT:-$DEFAULT_SERVICES}
+WITH_R_SUPPORT="false"
+
+# Parse command-line arguments
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --tag|-t)
+      BASE_TAG="$2"
+      shift 2
+      ;;
+    --services|-s)
+      SERVICES_INPUT="$2"
+      shift 2
+      ;;
+    --with-r-support)
+      WITH_R_SUPPORT="true"
+      shift
+      ;;
+    --help|-h)
+      echo "Usage: $0 [OPTIONS]"
+      echo ""
+      echo "Options:"
+      echo "  -t, --tag TAG              Base tag for the images (default: latest)"
+      echo "  -s, --services SERVICES    Services to build, comma-separated or '*' for all (default: *)"
+      echo "  --with-r-support           Enable R support for computing-unit-master (sets WITH_R_SUPPORT=true)"
+      echo "  -h, --help                 Show this help message"
+      echo ""
+      echo "Examples:"
+      echo "  $0 --tag v1.0.0 --services '*' --with-r-support"
+      echo "  $0 -t latest -s 'gui,computing-unit-master'"
+      echo "  $0  # Interactive mode"
+      exit 0
+      ;;
+    *)
+      echo "❌ Unknown option: $1"
+      echo "Run '$0 --help' for usage information."
+      exit 1
+      ;;
+  esac
+done
+
+# If BASE_TAG not provided via command-line, prompt interactively
+if [[ -z "$BASE_TAG" ]]; then
+  read -p "Enter the base tag for the images [${DEFAULT_TAG}]: " BASE_TAG
+  BASE_TAG=${BASE_TAG:-$DEFAULT_TAG}
+fi
+
+# If SERVICES_INPUT not provided via command-line, prompt interactively
+if [[ -z "$SERVICES_INPUT" ]]; then
+  read -p "Enter services to build (comma-separated, '*' for all) [${DEFAULT_SERVICES}]: " SERVICES_INPUT
+  SERVICES_INPUT=${SERVICES_INPUT:-$DEFAULT_SERVICES}
+fi
 
 # Convert the user input into an array for easy lookup
 IFS=',' read -ra SELECTED_SERVICES <<< "$SERVICES_INPUT"
@@ -64,6 +107,9 @@ fi
 
 FULL_TAG="${BASE_TAG}-${TAG_SUFFIX}"
 echo "🔍 Detected architecture: $ARCH -> Building for $PLATFORM with tag :$FULL_TAG"
+if [[ "$WITH_R_SUPPORT" == "true" ]]; then
+  echo "🔍 R support enabled for computing-unit-master"
+fi
 
 # Ensure Buildx is ready
 docker buildx create --name texera-builder --use --bootstrap > /dev/null 2>&1 || docker buildx use texera-builder
@@ -72,7 +118,6 @@ cd "$(dirname "$0")"
 
 # Auto-detect Dockerfiles in current directory
 dockerfiles=( *.dockerfile )
-
 if [[ ${#dockerfiles[@]} -eq 0 ]]; then
   echo "❌ No Dockerfiles found (*.dockerfile) in the current directory."
   exit 1
@@ -90,15 +135,25 @@ for dockerfile in "${dockerfiles[@]}"; do
   fi
 
   image="texera/$service_name:$FULL_TAG"
-
   echo "👉 Building $image from $dockerfile"
 
-  docker buildx build \
-    --platform "$PLATFORM" \
-    -f "$dockerfile" \
-    -t "$image" \
-    --push \
-    ..
+  # Add WITH_R_SUPPORT build arg for computing-unit-master
+  if [[ "$service_name" == "computing-unit-master" && "$WITH_R_SUPPORT" == "true" ]]; then
+    docker buildx build \
+      --platform "$PLATFORM" \
+      -f "$dockerfile" \
+      -t "$image" \
+      --build-arg WITH_R_SUPPORT=true \
+      --push \
+      ..
+  else
+    docker buildx build \
+      --platform "$PLATFORM" \
+      -f "$dockerfile" \
+      -t "$image" \
+      --push \
+      ..
+  fi
 done
 
 # Build pylsp service (directory: pylsp)
@@ -125,4 +180,4 @@ if should_build "y-websocket-server"; then
     ./y-websocket-server
 fi
 
-echo "✅ All images built and pushed with tag :$FULL_TAG"
+echo "✅ All images built and pushed with tag :$FULL_TAG"
\ No newline at end of file
diff --git a/core/scripts/build-services.sh b/bin/build-services.sh
similarity index 100%
rename from core/scripts/build-services.sh
rename to bin/build-services.sh
diff --git a/core/scripts/build.sh b/bin/build.sh
similarity index 94%
rename from core/scripts/build.sh
rename to bin/build.sh
index 1bc794980f1..ebb3f708aa2 100755
--- a/core/scripts/build.sh
+++ b/bin/build.sh
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-./scripts/build-services.sh
-./scripts/gui.sh
\ No newline at end of file
+bin/build-services.sh
+bin/frontend.sh
\ No newline at end of file
diff --git a/core/scripts/computing-unit-managing-service.sh b/bin/computing-unit-managing-service.sh
similarity index 100%
rename from core/scripts/computing-unit-managing-service.sh
rename to bin/computing-unit-managing-service.sh
diff --git a/bin/computing-unit-master.dockerfile b/bin/computing-unit-master.dockerfile
new file mode 100644
index 00000000000..eeb60c13904
--- /dev/null
+++ b/bin/computing-unit-master.dockerfile
@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
+
+# Set working directory
+WORKDIR /texera
+
+# Copy modules for building the service
+COPY common/ common/
+COPY amber/ amber/
+COPY project/ project/
+COPY build.sbt build.sbt
+
+# Update system and install dependencies
+RUN apt-get update && apt-get install -y \
+    netcat \
+    unzip \
+    libpq-dev \
+    && apt-get clean
+
+# Add .git for runtime calls to jgit from OPversion
+COPY .git .git
+
+RUN sbt clean WorkflowExecutionService/dist
+
+# Unzip the texera binary
+RUN unzip amber/target/universal/amber-*.zip -d amber/target/
+
+FROM eclipse-temurin:11-jdk-jammy AS runtime
+
+WORKDIR /texera/amber
+
+COPY --from=build /texera/amber/requirements.txt /tmp/requirements.txt
+COPY --from=build /texera/amber/operator-requirements.txt /tmp/operator-requirements.txt
+
+# Install Python runtime dependencies
+RUN apt-get update && apt-get install -y \
+    python3-pip \
+    python3-dev \
+    libpq-dev \
+    curl \
+    unzip \
+    && apt-get clean
+
+# Install Python packages
+RUN pip3 install --upgrade pip setuptools wheel && \
+    pip3 install -r /tmp/requirements.txt && \
+    pip3 install -r /tmp/operator-requirements.txt
+
+# Copy the built texera binary from the build phase
+COPY --from=build /texera/.git /texera/amber/.git
+COPY --from=build /texera/amber/target/amber-* /texera/amber/
+# Copy resources directories from build phase
+COPY --from=build /texera/common/config/src/main/resources /texera/amber/common/config/src/main/resources
+COPY --from=build /texera/amber/src/main/resources /texera/amber/src/main/resources
+# Copy code for python & R UDF
+COPY --from=build /texera/amber/src/main/python /texera/amber/src/main/python
+
+CMD ["bin/computing-unit-master"]
+
+EXPOSE 8085
diff --git a/deployment/computing-unit-worker.dockerfile b/bin/computing-unit-worker.dockerfile
similarity index 60%
rename from deployment/computing-unit-worker.dockerfile
rename to bin/computing-unit-worker.dockerfile
index b6e1a485556..6cf00719ff5 100644
--- a/deployment/computing-unit-worker.dockerfile
+++ b/bin/computing-unit-worker.dockerfile
@@ -18,10 +18,13 @@
 FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
 
 # Set working directory
-WORKDIR /core
+WORKDIR /texera
 
-# Copy all projects under core to /core
-COPY core/ .
+# Copy modules for building the service
+COPY common/ common/
+COPY amber/ amber/
+COPY project/ project/
+COPY build.sbt build.sbt
 
 # Update system and install dependencies
 RUN apt-get update && apt-get install -y \
@@ -30,42 +33,40 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     && apt-get clean
 
-WORKDIR /core
 # Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
+COPY .git .git
 
 RUN sbt clean WorkflowExecutionService/dist
 
 # Unzip the texera binary
-RUN unzip amber/target/universal/texera-*.zip -d amber/target/
+RUN unzip amber/target/universal/amber-*.zip -d amber/target/
 
 FROM eclipse-temurin:11-jre-jammy AS runtime
 
-WORKDIR /core/amber
+WORKDIR /texera/amber
 
-COPY --from=build /core/amber/requirements.txt /tmp/requirements.txt
-COPY --from=build /core/amber/operator-requirements.txt /tmp/operator-requirements.txt
+COPY --from=build /texera/amber/requirements.txt /tmp/requirements.txt
+COPY --from=build /texera/amber/operator-requirements.txt /tmp/operator-requirements.txt
 
-# Install Python runtime and dependencies
+# Install Python runtime dependencies
 RUN apt-get update && apt-get install -y \
     python3-pip \
     python3-dev \
     libpq-dev \
     && apt-get clean
 
-RUN pip3 install --upgrade pip setuptools wheel
-RUN pip3 install python-lsp-server python-lsp-server[websockets]
-
-# Install requirements with a fallback for wordcloud
-RUN pip3 install -r /tmp/requirements.txt
-RUN pip3 install --no-cache-dir --find-links https://pypi.org/simple/ -r /tmp/operator-requirements.txt || \
+# Install Python packages
+RUN pip3 install --upgrade pip setuptools wheel && \
+    pip3 install python-lsp-server python-lsp-server[websockets] && \
+    pip3 install -r /tmp/requirements.txt && \
+    pip3 install --no-cache-dir --find-links https://pypi.org/simple/ -r /tmp/operator-requirements.txt || \
     pip3 install --no-cache-dir wordcloud==1.9.2
 
 # Copy the built texera binary from the build phase
-COPY --from=build /core/amber/target/texera-* /core/amber
-# Copy resources directories under /core from build phase
-COPY --from=build /core/amber/src/main/resources /core/amber/src/main/resources
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
+COPY --from=build /texera/amber/target/amber-* /texera/amber/
+# Copy resources directories from build phase
+COPY --from=build /texera/amber/src/main/resources /texera/amber/src/main/resources
+COPY --from=build /texera/common/config/src/main/resources /texera/amber/common/config/src/main/resources
 
 CMD ["bin/computing-unit-worker"]
 
diff --git a/deployment/config-service.dockerfile b/bin/config-service.dockerfile
similarity index 67%
rename from deployment/config-service.dockerfile
rename to bin/config-service.dockerfile
index bcabed144fc..1a8bd34ec62 100644
--- a/deployment/config-service.dockerfile
+++ b/bin/config-service.dockerfile
@@ -18,10 +18,13 @@
 FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
 
 # Set working directory
-WORKDIR /core
+WORKDIR /texera
 
-# Copy all projects under core to /core
-COPY core/ .
+# Copy modules for building the service
+COPY common/ common/
+COPY config-service/ config-service/
+COPY project/ project/
+COPY build.sbt build.sbt
 
 # Update system and install dependencies
 RUN apt-get update && apt-get install -y \
@@ -30,25 +33,24 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     && apt-get clean
 
-WORKDIR /core
 # Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
+COPY .git .git
 
 RUN sbt clean ConfigService/dist
 
 # Unzip the texera binary
-RUN unzip  config-service/target/universal/config-service-*.zip -d target/
+RUN unzip config-service/target/universal/config-service-*.zip -d target/
 
 FROM eclipse-temurin:11-jre-jammy AS runtime
 
-WORKDIR /core
+WORKDIR /texera
 
-COPY --from=build /.git /.git
+COPY --from=build /texera/.git /texera/.git
 # Copy the built texera binary from the build phase
-COPY --from=build /core/target/config-service-* /core/
-# Copy resources directories under /core from build phase
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
-COPY --from=build /core/config-service/src/main/resources /core/config-service/src/main/resources
+COPY --from=build /texera/target/config-service-* /texera/
+# Copy resources directories from build phase
+COPY --from=build /texera/common/config/src/main/resources /texera/common/config/src/main/resources
+COPY --from=build /texera/config-service/src/main/resources /texera/config-service/src/main/resources
 
 CMD ["bin/config-service"]
 
diff --git a/core/scripts/config-service.sh b/bin/config-service.sh
similarity index 100%
rename from core/scripts/config-service.sh
rename to bin/config-service.sh
diff --git a/core/scripts/config.php b/bin/config.php
similarity index 100%
rename from core/scripts/config.php
rename to bin/config.php
diff --git a/core/scripts/cron-restart-crashed-worker.sh b/bin/cron-restart-crashed-worker.sh
similarity index 94%
rename from core/scripts/cron-restart-crashed-worker.sh
rename to bin/cron-restart-crashed-worker.sh
index 7b1f0cda157..918a8555e50 100755
--- a/core/scripts/cron-restart-crashed-worker.sh
+++ b/bin/cron-restart-crashed-worker.sh
@@ -25,9 +25,7 @@ if jps -m | grep -q "TexeraWebApplication"; then
     echo "TexeraRunWorker is missing. Restarting..."
 
     # Restart TexeraRunWorker
-    cd "$(dirname "$0")"
-    cd ../
-    ./scripts/worker.sh >/dev/null
+    bin/worker.sh >/dev/null
 
     echo "TexeraRunWorker restarted."
   else
diff --git a/core/scripts/deploy-daemon.sh b/bin/deploy-daemon.sh
similarity index 84%
rename from core/scripts/deploy-daemon.sh
rename to bin/deploy-daemon.sh
index 90d270704b3..920d74b37bb 100755
--- a/core/scripts/deploy-daemon.sh
+++ b/bin/deploy-daemon.sh
@@ -31,18 +31,17 @@ done
 if  ! $skipCompilation
 then
   echo "${green}Compiling Services...${reset}"
-  bash scripts/build-services.sh
+  bash bin/build-services.sh
   echo "${green}Services compiled.${reset}"
 
   echo "${green}Compiling GUI...${reset}"
-  cd gui && yarn install && ng build --configuration production --deploy-url=/ --base-href=/
+  (cd frontend && yarn install && ng build --configuration production --deploy-url=/ --base-href=/)
   echo "${green}GUI compiled.${reset}"
   echo
-  cd ..
 fi
 
 echo "${green}Starting TexeraWebApplication in daemon...${reset}"
-setsid nohup ./scripts/server.sh >/dev/null 2>&1 &
+setsid nohup bin/server.sh >/dev/null 2>&1 &
 echo "${green}Waiting TexeraWebApplication to launch on 8080...${reset}"
 while ! nc -z localhost 8080; do
 	sleep 0.1 # wait 100ms before check again
@@ -51,7 +50,7 @@ echo "${green}TexeraWebApplication launched at $(pgrep -f TexeraWebApplication)$
 echo
 
 echo "${green}Starting WorkflowCompilingService in daemon...${reset}"
-setsid nohup ./scripts/workflow-compiling-service.sh >/dev/null 2>&1 &
+setsid nohup bin/workflow-compiling-service.sh >/dev/null 2>&1 &
 echo "${green}Waiting TexeraWorkflowCompilingService to launch on 9090...${reset}"
 while ! nc -z localhost 9090; do
 	sleep 0.1 # wait 100ms before check again
@@ -60,7 +59,7 @@ echo "${green}WorkflowCompilingService launched at $(pgrep -f TexeraWorkflowComp
 echo
 
 echo "${green}Starting FileService in daemon...${reset}"
-setsid nohup ./scripts/file-service.sh >/dev/null 2>&1 &
+setsid nohup bin/file-service.sh >/dev/null 2>&1 &
 echo "${green}Waiting FileService to launch on 9092...${reset}"
 while ! nc -z localhost 9092; do
 	sleep 0.1 # wait 100ms before check again
@@ -69,7 +68,7 @@ echo "${green}FileService launched at $(pgrep -f FileService)${reset}"
 echo
 
 echo "${green}Starting ConfigService in daemon...${reset}"
-setsid nohup ./scripts/config-service.sh >/dev/null 2>&1 &
+setsid nohup bin/config-service.sh >/dev/null 2>&1 &
 echo "${green}Waiting ConfigService to launch on 9094...${reset}"
 while ! nc -z localhost 9094; do
 	sleep 0.1 # wait 100ms before check again
@@ -78,7 +77,7 @@ echo "${green}ConfigService launched at $(pgrep -f ConfigService)${reset}"
 echo
 
 echo "${green}Starting ComputingUnitManagingService in daemon...${reset}"
-setsid nohup ./scripts/computing-unit-managing-service.sh >/dev/null 2>&1 &
+setsid nohup bin/computing-unit-managing-service.sh >/dev/null 2>&1 &
 echo "${green}Waiting ComputingUnitManagingService to launch on 8888...${reset}"
 while ! nc -z localhost 8888; do
 	sleep 0.1 # wait 100ms before check again
@@ -87,7 +86,7 @@ echo "${green}ComputingUnitManagingService launched at $(pgrep -f ComputingUnitM
 echo
 
 echo "${green}Starting WorkflowComputingUnit in daemon...${reset}"
-setsid nohup ./scripts/workflow-computing-unit.sh >/dev/null 2>&1 &
+setsid nohup bin/workflow-computing-unit.sh >/dev/null 2>&1 &
 echo "${green}Waiting WorkflowComputingUnit to launch on 8085...${reset}"
 while ! nc -z localhost 8085; do
 	sleep 0.1 # wait 100ms before check again
@@ -96,6 +95,6 @@ echo "${green}WorkflowComputingUnit launched at $(pgrep -f WorkflowComputingUnit
 echo
 
 echo "${green}Starting shared editing server...${reset}"
-setsid nohup ./scripts/shared-editing-server.sh >/dev/null 2>&1 &
+setsid nohup bin/shared-editing-server.sh >/dev/null 2>&1 &
 sleep 2
 echo "${green}Shared Editing Server launched at $(pgrep -f y-websocket)${reset}"
diff --git a/core/scripts/deploy-docker.sh b/bin/deploy-docker.sh
similarity index 93%
rename from core/scripts/deploy-docker.sh
rename to bin/deploy-docker.sh
index f61b79ed06b..29dd88f4ff3 100755
--- a/core/scripts/deploy-docker.sh
+++ b/bin/deploy-docker.sh
@@ -18,7 +18,7 @@
 
 
 # Start server.sh in the background
-bash scripts/server.sh &
+bash bin/server.sh &
 
 # Wait for server.sh to start by sleeping for a brief period (adjust as needed)
 sleep 5
@@ -30,7 +30,7 @@ if ! ps -p $! > /dev/null; then
 fi
 
 # Start workflow-compiling-service.sh in the background
-bash scripts/workflow-compiling-service.sh &
+bash bin/workflow-compiling-service.sh &
 
 # Wait for workflow-compiling-service.sh to start by sleeping for a brief period (adjust as needed)
 sleep 5
@@ -42,7 +42,7 @@ if ! ps -p $! > /dev/null; then
 fi
 
 # Start computing unit master node in the background
-bash scripts/workflow-computing-unit.sh &
+bash bin/workflow-computing-unit.sh &
 
 # Wait for one of server.sh and computing unit master node to complete
 wait -n
diff --git a/deployment/file-service.dockerfile b/bin/file-service.dockerfile
similarity index 73%
rename from deployment/file-service.dockerfile
rename to bin/file-service.dockerfile
index 25fb9c945e2..0fc8a433d74 100644
--- a/deployment/file-service.dockerfile
+++ b/bin/file-service.dockerfile
@@ -18,10 +18,13 @@
 FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
 
 # Set working directory
-WORKDIR /core
+WORKDIR /texera
 
-# Copy all projects under core to /core
-COPY core/ .
+# Copy modules for building the service
+COPY common/ common/
+COPY file-service/ file-service/
+COPY project/ project/
+COPY build.sbt build.sbt
 
 # Update system and install dependencies
 RUN apt-get update && apt-get install -y \
@@ -30,9 +33,8 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     && apt-get clean
 
-WORKDIR /core
 # Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
+COPY .git .git
 
 RUN sbt clean FileService/dist
 
@@ -41,13 +43,13 @@ RUN unzip file-service/target/universal/file-service-*.zip -d target/
 
 FROM eclipse-temurin:11-jre-jammy AS runtime
 
-WORKDIR /core
+WORKDIR /texera
 
 # Copy the built texera binary from the build phase
-COPY --from=build /core/target/file-service-* /core/
-# Copy resources directories under /core from build phase
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
-COPY --from=build /core/file-service/src/main/resources /core/file-service/src/main/resources
+COPY --from=build /texera/target/file-service-* /texera/
+# Copy resources directories from build phase
+COPY --from=build /texera/common/config/src/main/resources /texera/common/config/src/main/resources
+COPY --from=build /texera/file-service/src/main/resources /texera/file-service/src/main/resources
 
 CMD ["bin/file-service"]
 
diff --git a/core/scripts/file-service.sh b/bin/file-service.sh
similarity index 100%
rename from core/scripts/file-service.sh
rename to bin/file-service.sh
diff --git a/bin/fix-format.sh b/bin/fix-format.sh
new file mode 100755
index 00000000000..bcaa90f1d52
--- /dev/null
+++ b/bin/fix-format.sh
@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# -------------------------------------------------------------
+# fix-format.sh
+# -------------------------------------------------------------
+# Runs code formatters for the Texera repository.
+#
+# Usage:
+#   bin/fix-format.sh               # Format all (Scala, Frontend, Python)
+#   bin/fix-format.sh --scala       # Format Scala only
+#   bin/fix-format.sh --frontend    # Format Frontend only
+#   bin/fix-format.sh --python      # Format Python only
+# -------------------------------------------------------------
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+
+source "$SCRIPT_DIR/utils/texera-logging.sh"
+
+TEXERA_HOME="$(/usr/bin/env bash "$SCRIPT_DIR/utils/resolve-texera-home.sh")"
+if [[ -z "${TEXERA_HOME:-}" ]]; then
+  exit 1
+fi
+
+# --- Key directories ---
+FRONTEND_DIR="$TEXERA_HOME/frontend"
+AMBER_PY_DIR="$TEXERA_HOME/amber/src/main/python"
+
+[[ -d "$FRONTEND_DIR" ]] || { tx_error "Frontend directory not found: $FRONTEND_DIR"; exit 1; }
+[[ -d "$AMBER_PY_DIR"  ]] || { tx_error "Amber Python directory not found: $AMBER_PY_DIR"; exit 1; }
+
+# --- Argument parsing ---
+TARGET="${1:-all}"
+run_scala=false
+run_frontend=false
+run_python=false
+
+case "$TARGET" in
+  --scala)    run_scala=true ;;
+  --frontend) run_frontend=true ;;
+  --python)   run_python=true ;;
+  ""|--all|all) run_scala=true; run_frontend=true; run_python=true ;;
+  *)
+    tx_error "Unknown option: $TARGET"
+    echo "Usage: bin/fix-format.sh [--scala | --frontend | --python | --all]"
+    exit 1
+    ;;
+esac
+
+# --- 1) Scala formatting ---
+if $run_scala; then
+  tx_info "Running sbt scalafmtAll at repo root..."
+  if ! command -v sbt >/dev/null 2>&1; then
+    tx_error "sbt not found. Please install sbt."
+    exit 1
+  fi
+  (
+    cd "$TEXERA_HOME"
+    sbt scalafmtAll
+  )
+  tx_success "Scala formatting completed."
+fi
+
+# --- 2) Frontend formatting ---
+if $run_frontend; then
+  tx_info "Running yarn format:fix in frontend..."
+  if ! command -v yarn >/dev/null 2>&1; then
+    tx_error "yarn not found. Please install Yarn."
+    exit 1
+  fi
+  (
+    cd "$FRONTEND_DIR"
+    yarn format:fix
+  )
+  tx_success "Frontend formatting completed."
+fi
+
+# --- 3) Python formatting ---
+if $run_python; then
+  tx_info "Running ruff in amber/src/main/python..."
+  if ! command -v ruff >/dev/null 2>&1; then
+    tx_error "ruff not found. Install with: pip install ruff"
+    exit 1
+  fi
+  (
+    cd "$AMBER_PY_DIR"
+    ruff format .
+  )
+  tx_success "Python formatting completed."
+fi
+
+tx_success "✅ Formatting tasks completed successfully!"
\ No newline at end of file
diff --git a/core/scripts/forum/flarum.sql b/bin/forum/flarum.sql
similarity index 100%
rename from core/scripts/forum/flarum.sql
rename to bin/forum/flarum.sql
diff --git a/core/scripts/forum/macos-install.sh b/bin/forum/macos-install.sh
similarity index 99%
rename from core/scripts/forum/macos-install.sh
rename to bin/forum/macos-install.sh
index 451831f478e..f38b0b972de 100755
--- a/core/scripts/forum/macos-install.sh
+++ b/bin/forum/macos-install.sh
@@ -82,8 +82,12 @@ echo "Restarting Apache..."
 sudo apachectl restart
 
 # Publish assets
+(
+
 cd /opt/homebrew/var/www/flarum
 echo "Configuring flarum..."
 php flarum assets:publish
 sudo chown -R _www:_www /opt/homebrew/var/www/flarum
-echo "Flarum installation completed\nYou can now access your flarum forum in Texera"
\ No newline at end of file
+echo "Flarum installation completed\nYou can now access your flarum forum in Texera"
+
+)
\ No newline at end of file
diff --git a/core/scripts/forum/start-flarum.sh b/bin/forum/start-flarum.sh
similarity index 100%
rename from core/scripts/forum/start-flarum.sh
rename to bin/forum/start-flarum.sh
diff --git a/core/scripts/forum/ubuntu-install.sh b/bin/forum/ubuntu-install.sh
similarity index 93%
rename from core/scripts/forum/ubuntu-install.sh
rename to bin/forum/ubuntu-install.sh
index ca63344b32b..e4d7c119523 100755
--- a/core/scripts/forum/ubuntu-install.sh
+++ b/bin/forum/ubuntu-install.sh
@@ -31,10 +31,10 @@ php -r "unlink('composer-setup.php');"
 composer create-project flarum/flarum /opt/flarum
 composer require --working-dir=/opt/flarum michaelbelgium/flarum-discussion-views
 composer require --working-dir=/opt/flarum fof/byobu:"*"
-sudo cp ./scripts/config.php /opt/flarum/config.php
-sudo cp ./scripts/.htaccess /opt/flarum/public/.htaccess
+sudo cp bin/config.php /opt/flarum/config.php
+sudo cp bin/.htaccess /opt/flarum/public/.htaccess
 sudo chown -R www-data:www-data /opt/flarum
-sudo mysql -u root -p < ./scripts/sql/flarum.sql
+sudo mysql -u root -p < sql/flarum.sql
 
 VHOST_CONF="/etc/apache2/sites-available/flarum.conf"
 sudo touch VHOST_CONF
diff --git a/core/scripts/gui-dev.sh b/bin/frontend-dev.sh
similarity index 96%
rename from core/scripts/gui-dev.sh
rename to bin/frontend-dev.sh
index 14b20644ab6..288839aeeac 100644
--- a/core/scripts/gui-dev.sh
+++ b/bin/frontend-dev.sh
@@ -16,5 +16,4 @@
 # limitations under the License.
 #
 
-cd gui
-ng serve
\ No newline at end of file
+(cd frontend && ng serve)
\ No newline at end of file
diff --git a/core/scripts/gui-proto-gen.sh b/bin/frontend-proto-gen.sh
similarity index 89%
rename from core/scripts/gui-proto-gen.sh
rename to bin/frontend-proto-gen.sh
index e3576a577e3..45106578438 100755
--- a/core/scripts/gui-proto-gen.sh
+++ b/bin/frontend-proto-gen.sh
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-TEXERA_ROOT="$(git rev-parse --show-toplevel)"
-GUI_DIR="$TEXERA_ROOT/core/gui"
-PROTOBUF_DIR="$TEXERA_ROOT/core/workflow-core/src/main/protobuf"
+TEXERA_HOME="$(git rev-parse --show-toplevel)"
+GUI_DIR="$TEXERA_HOME/frontend"
+PROTOBUF_DIR="$TEXERA_HOME/core/workflow-core/src/main/protobuf"
 GUI_PROTO_DIR="$GUI_DIR/src/app/common/type"
 
 WORKFLOW_PROTO=$(find "$PROTOBUF_DIR" -iname "workflow.proto")
diff --git a/core/amber/r-requirements.txt b/bin/frontend.sh
old mode 100644
new mode 100755
similarity index 94%
rename from core/amber/r-requirements.txt
rename to bin/frontend.sh
index 1216cdce4f5..65b15e19e85
--- a/core/amber/r-requirements.txt
+++ b/bin/frontend.sh
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-rpy2==3.5.11
-rpy2-arrow==0.0.8
\ No newline at end of file
+(cd frontend && yarn install && yarn run build)
diff --git a/core/scripts/install-nltk.sh b/bin/install-nltk.sh
similarity index 100%
rename from core/scripts/install-nltk.sh
rename to bin/install-nltk.sh
diff --git a/deployment/k8s/texera-helmchart/Chart.yaml b/bin/k8s/Chart.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/Chart.yaml
rename to bin/k8s/Chart.yaml
diff --git a/deployment/k8s/README.md b/bin/k8s/README.md
similarity index 100%
rename from deployment/k8s/README.md
rename to bin/k8s/README.md
diff --git a/bin/k8s/files/iceberg_postgres_catalog.sql b/bin/k8s/files/iceberg_postgres_catalog.sql
new file mode 120000
index 00000000000..7def191e8ee
--- /dev/null
+++ b/bin/k8s/files/iceberg_postgres_catalog.sql
@@ -0,0 +1 @@
+../../../sql/iceberg_postgres_catalog.sql
\ No newline at end of file
diff --git a/bin/k8s/files/texera_ddl.sql b/bin/k8s/files/texera_ddl.sql
new file mode 120000
index 00000000000..5653a9a01e1
--- /dev/null
+++ b/bin/k8s/files/texera_ddl.sql
@@ -0,0 +1 @@
+../../../sql/texera_ddl.sql
\ No newline at end of file
diff --git a/bin/k8s/files/texera_lakefs.sql b/bin/k8s/files/texera_lakefs.sql
new file mode 120000
index 00000000000..6d58e92106a
--- /dev/null
+++ b/bin/k8s/files/texera_lakefs.sql
@@ -0,0 +1 @@
+../../../sql/texera_lakefs.sql
\ No newline at end of file
diff --git a/bin/k8s/templates/access-control-service-deployment.yaml b/bin/k8s/templates/access-control-service-deployment.yaml
new file mode 100644
index 00000000000..a332c65bd39
--- /dev/null
+++ b/bin/k8s/templates/access-control-service-deployment.yaml
@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name:  {{.Release.Name}}-{{ .Values.accessControlService.name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}-{{ .Values.accessControlService.name }}
+spec:
+  replicas: {{ .Values.accessControlService.numOfPods | default 1 }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-{{ .Values.accessControlService.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-{{ .Values.accessControlService.name }}
+    spec:
+      containers:
+        - name: {{ .Values.accessControlService.name }}
+          image: {{ .Values.accessControlService.imageName }}
+          imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.accessControlService.service.port }}
+          env:
+            - name: STORAGE_JDBC_URL
+              value: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/texera_db?currentSchema=texera_db,public
+            - name: STORAGE_JDBC_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Release.Name }}-postgresql
+                  key: postgres-password
+          livenessProbe:
+            httpGet:
+              path: /api/healthcheck
+              port: {{ .Values.accessControlService.service.port }}
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /api/healthcheck
+              port: {{ .Values.accessControlService.service.port }}
+            initialDelaySeconds: 5
+            periodSeconds: 5
\ No newline at end of file
diff --git a/deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml b/bin/k8s/templates/access-control-service-service.yaml
similarity index 67%
rename from deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml
rename to bin/k8s/templates/access-control-service-service.yaml
index 74620d2722b..25f03905669 100644
--- a/deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml
+++ b/bin/k8s/templates/access-control-service-service.yaml
@@ -16,19 +16,15 @@
 # under the License.
 
 apiVersion: v1
-kind: ConfigMap
+kind: Service
 metadata:
-  name: {{ .Values.postgresql.primary.initdb.scriptsConfigMap }}
+  name: {{ .Release.Name }}-{{ .Values.accessControlService.name }}-svc
   namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Release.Name }}
-data:
-  init.sh: |
-    #!/bin/bash
-    echo "Running Texera schema initialization..."
-    export PGPASSWORD=$POSTGRES_PASSWORD
-    cat <<'EOF' > /tmp/init.sql
-{{ .Files.Get "files/texera_ddl.sql" | indent 6 }}
-    EOF
-    psql -U postgres -f /tmp/init.sql
-    echo "Schema initialization complete."
\ No newline at end of file
+spec:
+  type: {{ .Values.accessControlService.service.type }}
+  selector:
+    app: {{ .Release.Name }}-{{ .Values.accessControlService.name }}
+  ports:
+    - protocol: TCP
+      port: {{ .Values.accessControlService.service.port }}
+      targetPort: {{ .Values.accessControlService.service.port }}
\ No newline at end of file
diff --git a/deployment/k8s/texera-helmchart/templates/config-service-deployment.yaml b/bin/k8s/templates/config-service-deployment.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/config-service-deployment.yaml
rename to bin/k8s/templates/config-service-deployment.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/config-service-service.yaml b/bin/k8s/templates/config-service-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/config-service-service.yaml
rename to bin/k8s/templates/config-service-service.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/envoy-config.yaml b/bin/k8s/templates/envoy-config.yaml
similarity index 63%
rename from deployment/k8s/texera-helmchart/templates/envoy-config.yaml
rename to bin/k8s/templates/envoy-config.yaml
index 1de4411c099..2ba17e63f8a 100644
--- a/deployment/k8s/texera-helmchart/templates/envoy-config.yaml
+++ b/bin/k8s/templates/envoy-config.yaml
@@ -63,6 +63,32 @@ data:
                                 prefix_rewrite: "/api/executions/result/export"
                                 timeout: "0s"
                     http_filters:
+                      - name: envoy.filters.http.ext_authz
+                        typed_config:
+                          "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz
+                          with_request_body:
+                            # Max allowed by Envoy (uint32): 4,294,967,295 bytes (~4 GiB)
+                            max_request_bytes: 4294967295
+                            allow_partial_message: true     # forward partial body if larger than limit
+                          http_service:
+                            server_uri:
+                              uri: http://{{ .Release.Name }}-{{ .Values.accessControlService.name }}-svc.{{ .Release.Namespace }}.svc.cluster.local
+                              cluster: access_control_service_cluster
+                              timeout: 5s
+                            path_prefix: /api/auth
+                            authorization_request:
+                              allowed_headers:
+                                patterns:
+                                  - exact: "authorization"
+                                  - exact: "x-envoy-original-path"
+                            authorization_response:
+                              allowed_upstream_headers:
+                                patterns:
+                                  - exact: "x-user-cu-access"
+                                  - exact: "x-user-id"
+                                  - exact: "x-user-name"
+                                  - exact: "x-user-email"
+                          failure_mode_allow: false
                       - name: envoy.filters.http.lua
                         typed_config:
                           "@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua
@@ -90,6 +116,9 @@ data:
                       - name: envoy.access_loggers.stdout
                         typed_config:
                           "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
+                          log_format:
+                            text_format_source:
+                              inline_string: "[%START_TIME%] \"%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?PATH)% %PROTOCOL%\" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% \"%REQ(X-FORWARDED-FOR)%\" \"%REQ(USER-AGENT)%\" \"%REQ(X-REQUEST-ID)%\" \"%REQ(:AUTHORITY)%\" \"%UPSTREAM_HOST%\" AuthHeaders[user-id:\"%REQ(X-USER-ID)%\" email:\"%REQ(X-USER-EMAIL)%\" cu-access:\"%REQ(X-USER-CU-ACCESS)%\"]\n"
 
       clusters:
         - name: dynamic_service
@@ -103,3 +132,16 @@ data:
                 name: dynamic_dns_cache
                 dns_lookup_family: V4_ONLY
                 dns_refresh_rate: 1s
+        - name: access_control_service_cluster # The Access Control Service authorize requests and add user info headers
+          connect_timeout: 0.25s
+          type: LOGICAL_DNS
+          lb_policy: round_robin
+          load_assignment:
+            cluster_name: access_control_service_cluster
+            endpoints:
+              - lb_endpoints:
+                  - endpoint:
+                      address:
+                        socket_address:
+                          address: {{ .Release.Name }}-{{ .Values.accessControlService.name }}-svc.{{ .Release.Namespace }}.svc.cluster.local.
+                          port_value: {{ .Values.accessControlService.service.port }}
diff --git a/deployment/k8s/texera-helmchart/templates/envoy-deployment.yaml b/bin/k8s/templates/envoy-deployment.yaml
similarity index 96%
rename from deployment/k8s/texera-helmchart/templates/envoy-deployment.yaml
rename to bin/k8s/templates/envoy-deployment.yaml
index ee1894c2e2b..0e0522ee497 100644
--- a/deployment/k8s/texera-helmchart/templates/envoy-deployment.yaml
+++ b/bin/k8s/templates/envoy-deployment.yaml
@@ -42,7 +42,7 @@ spec:
           args:
             - "-c"
             - "/etc/envoy/envoy.yaml"  # Specify the path to the configuration file
-            # - "--log-level debug"  # Set level of logging
+            - "--log-level debug"  # Set level of logging
       volumes:
         - name: envoy-config
           configMap:
diff --git a/deployment/k8s/texera-helmchart/templates/envoy-service.yaml b/bin/k8s/templates/envoy-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/envoy-service.yaml
rename to bin/k8s/templates/envoy-service.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/example-data-loader-job.yaml b/bin/k8s/templates/example-data-loader-job.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/example-data-loader-job.yaml
rename to bin/k8s/templates/example-data-loader-job.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/external-names.yaml b/bin/k8s/templates/external-names.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/external-names.yaml
rename to bin/k8s/templates/external-names.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/file-service-deployment.yaml b/bin/k8s/templates/file-service-deployment.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/file-service-deployment.yaml
rename to bin/k8s/templates/file-service-deployment.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/file-service-service.yaml b/bin/k8s/templates/file-service-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/file-service-service.yaml
rename to bin/k8s/templates/file-service-service.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/ingress.yaml b/bin/k8s/templates/ingress.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/ingress.yaml
rename to bin/k8s/templates/ingress.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/lakefs-secret.yaml b/bin/k8s/templates/lakefs-secret.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/lakefs-secret.yaml
rename to bin/k8s/templates/lakefs-secret.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/lakefs-setup-job.yaml b/bin/k8s/templates/lakefs-setup-job.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/lakefs-setup-job.yaml
rename to bin/k8s/templates/lakefs-setup-job.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/minio-ingress.yaml b/bin/k8s/templates/minio-ingress.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/minio-ingress.yaml
rename to bin/k8s/templates/minio-ingress.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/minio-persistence.yaml b/bin/k8s/templates/minio-persistence.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/minio-persistence.yaml
rename to bin/k8s/templates/minio-persistence.yaml
diff --git a/bin/k8s/templates/postgresql-init-script-config.yaml b/bin/k8s/templates/postgresql-init-script-config.yaml
new file mode 100644
index 00000000000..104b9e19277
--- /dev/null
+++ b/bin/k8s/templates/postgresql-init-script-config.yaml
@@ -0,0 +1,50 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.postgresql.primary.initdb.scriptsConfigMap }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}
+data:
+  init.sh: |
+    #!/bin/bash
+    echo "Running Texera schema initialization..."
+    export PGPASSWORD=$POSTGRES_PASSWORD
+
+    # Execute SQL files in order
+    echo "Initializing LakeFS database..."
+    cat <<'EOF' > /tmp/texera_lakefs.sql
+{{ .Files.Get "files/texera_lakefs.sql" | indent 6 }}
+    EOF
+    psql -U postgres -f /tmp/texera_lakefs.sql
+
+    echo "Initializing Iceberg catalog database..."
+    cat <<'EOF' > /tmp/iceberg_postgres_catalog.sql
+{{ .Files.Get "files/iceberg_postgres_catalog.sql" | indent 6 }}
+    EOF
+    psql -U postgres -f /tmp/iceberg_postgres_catalog.sql
+
+    echo "Initializing Texera database..."
+    cat <<'EOF' > /tmp/texera_ddl.sql
+{{ .Files.Get "files/texera_ddl.sql" | indent 6 }}
+    EOF
+    psql -U postgres -f /tmp/texera_ddl.sql
+
+    echo "Schema initialization complete."
\ No newline at end of file
diff --git a/deployment/k8s/texera-helmchart/templates/postgresql-persistence.yaml b/bin/k8s/templates/postgresql-persistence.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/postgresql-persistence.yaml
rename to bin/k8s/templates/postgresql-persistence.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/pylsp.yaml b/bin/k8s/templates/pylsp.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/pylsp.yaml
rename to bin/k8s/templates/pylsp.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/shared-editing-server.yaml b/bin/k8s/templates/shared-editing-server.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/shared-editing-server.yaml
rename to bin/k8s/templates/shared-editing-server.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/webserver-deployment.yaml b/bin/k8s/templates/webserver-deployment.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/webserver-deployment.yaml
rename to bin/k8s/templates/webserver-deployment.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/webserver-service.yaml b/bin/k8s/templates/webserver-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/webserver-service.yaml
rename to bin/k8s/templates/webserver-service.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-compiling-service-deployment.yaml b/bin/k8s/templates/workflow-compiling-service-deployment.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-compiling-service-deployment.yaml
rename to bin/k8s/templates/workflow-compiling-service-deployment.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-compiling-service-service.yaml b/bin/k8s/templates/workflow-compiling-service-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-compiling-service-service.yaml
rename to bin/k8s/templates/workflow-compiling-service-service.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-unit-manager-deployment.yaml b/bin/k8s/templates/workflow-computing-unit-manager-deployment.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-unit-manager-deployment.yaml
rename to bin/k8s/templates/workflow-computing-unit-manager-deployment.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-unit-manager-service-account.yaml b/bin/k8s/templates/workflow-computing-unit-manager-service-account.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-unit-manager-service-account.yaml
rename to bin/k8s/templates/workflow-computing-unit-manager-service-account.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-unit-manager-service.yaml b/bin/k8s/templates/workflow-computing-unit-manager-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-unit-manager-service.yaml
rename to bin/k8s/templates/workflow-computing-unit-manager-service.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-unit-master-prepull-daemonset.yaml b/bin/k8s/templates/workflow-computing-unit-master-prepull-daemonset.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-unit-master-prepull-daemonset.yaml
rename to bin/k8s/templates/workflow-computing-unit-master-prepull-daemonset.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-unit-resource-quota.yaml b/bin/k8s/templates/workflow-computing-unit-resource-quota.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-unit-resource-quota.yaml
rename to bin/k8s/templates/workflow-computing-unit-resource-quota.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-units-namespace.yaml b/bin/k8s/templates/workflow-computing-units-namespace.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-units-namespace.yaml
rename to bin/k8s/templates/workflow-computing-units-namespace.yaml
diff --git a/deployment/k8s/texera-helmchart/templates/workflow-computing-units-service.yaml b/bin/k8s/templates/workflow-computing-units-service.yaml
similarity index 100%
rename from deployment/k8s/texera-helmchart/templates/workflow-computing-units-service.yaml
rename to bin/k8s/templates/workflow-computing-units-service.yaml
diff --git a/deployment/k8s/texera-helmchart/values.yaml b/bin/k8s/values.yaml
similarity index 91%
rename from deployment/k8s/texera-helmchart/values.yaml
rename to bin/k8s/values.yaml
index 1e36c20f6a1..11594422d37 100644
--- a/deployment/k8s/texera-helmchart/values.yaml
+++ b/bin/k8s/values.yaml
@@ -58,6 +58,9 @@ postgresql:
 
 minio:
   mode: standalone
+  image:
+    repository: bitnamilegacy/minio
+    tag: 2025.3.12-debian-12-r0
   customIngress:
     enabled: false
     ingressClassName: "" # e.g., "nginx"
@@ -110,7 +113,7 @@ texeraImages:
 # Example data loader configuration
 exampleDataLoader:
   enabled: true
-  image: texera/texera-example-data-loader:cluster
+  image: apache/texera-example-data-loader:1.1.0-incubating
   username: texera
   password: texera
   datasetDir: datasets
@@ -119,7 +122,7 @@ exampleDataLoader:
 webserver:
   name: webserver
   numOfPods: 1  # Number of pods for the Texera deployment
-  imageName: texera/texera-web-application:cluster # image name of the texera
+  imageName: apache/texera-dashboard-service:1.1.0-incubating # image name of the texera
   service:
     type: ClusterIP
     port: 8080
@@ -128,7 +131,7 @@ workflowComputingUnitManager:
   name: workflow-computing-unit-manager
   numOfPods: 1
   serviceAccountName: workflow-computing-unit-manager-service-account
-  imageName: texera/workflow-computing-unit-managing-service:cluster
+  imageName: apache/texera-workflow-computing-unit-managing-service:1.1.0-incubating
   service:
     type: ClusterIP
     port: 8888
@@ -136,7 +139,7 @@ workflowComputingUnitManager:
 workflowCompilingService:
   name: workflow-compiling-service
   numOfPods: 1
-  imageName: texera/workflow-compiling-service:cluster
+  imageName: apache/texera-workflow-compiling-service:1.1.0-incubating
   service:
     type: ClusterIP
     port: 9090
@@ -144,7 +147,7 @@ workflowCompilingService:
 fileService:
   name: file-service
   numOfPods: 1
-  imageName: texera/file-service:cluster
+  imageName: apache/texera-file-service:1.1.0-incubating
   service:
     type: ClusterIP
     port: 9092
@@ -152,11 +155,19 @@ fileService:
 configService:
   name: config-service
   numOfPods: 1
-  imageName: texera/config-service:cluster
+  imageName: apache/texera-config-service:1.1.0-incubating
   service:
     type: ClusterIP
     port: 9094
 
+accessControlService:
+  name: access-control-service
+  numOfPods: 1
+  imageName: apache/texera-access-control-service:1.1.0-incubating
+  service:
+    type: ClusterIP
+    port: 9096
+
 # Configs of the envoy proxy, used to routerequests to the computing units
 envoy:
   replicas: 1
@@ -182,7 +193,7 @@ workflowComputingUnitPool:
     cpu: 100
     memory: 100Gi
     nvidiaGpu: 5
-  imageName: texera/computing-unit-master:cluster
+  imageName: apache/texera-workflow-execution-coordinator:1.1.0-incubating
   service:
     port: 8085
     targetPort: 8085
@@ -330,11 +341,12 @@ ingressPaths:
     - path: /wsapi/workflow-websocket
       serviceName: envoy-svc
       servicePort: 10000
-    - path: /api/executions/[0-9]+/stats/[0-9]+$
+    - path: /api/executions/*/stats/*
       pathType: ImplementationSpecific
       serviceName: envoy-svc
       servicePort: 10000
-    - path: /api/executions/result/export
+    - path: /api/executions/result/export/*
+      pathType: ImplementationSpecific
       serviceName: envoy-svc
       servicePort: 10000
     - path: /api
diff --git a/bin/litellm-config.yaml b/bin/litellm-config.yaml
new file mode 100644
index 00000000000..6a75d7e0013
--- /dev/null
+++ b/bin/litellm-config.yaml
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# The default configuration file for starting litellm (https://docs.litellm.ai/docs/proxy/quick_start)
+# To start the litellm service:
+# 1. Install litellm by:
+#    pip install 'litellm[proxy]'
+# 2. Set your API keys as environment variable, e.g.
+#    export ANTHROPIC_API_KEY=<your-api-key>
+# 3. Start litellm by:
+#    litellm --config bin/litellm-config.yaml
+# By default, litellm is running on http://0.0.0.0:4000
+model_list:
+  - model_name: claude-haiku-4.5
+    litellm_params:
+      model: claude-haiku-4-5-20251001
+      api_key: "os.environ/ANTHROPIC_API_KEY"
+  - model_name: gpt-5-mini
+    litellm_params:
+      model: gpt-5-mini-2025-08-07
+      api_key: "os.environ/OPENAI_API_KEY"
\ No newline at end of file
diff --git a/deployment/merge-image-tags.sh b/bin/merge-image-tags.sh
similarity index 86%
rename from deployment/merge-image-tags.sh
rename to bin/merge-image-tags.sh
index ab44b2297f0..2458256d76d 100755
--- a/deployment/merge-image-tags.sh
+++ b/bin/merge-image-tags.sh
@@ -16,18 +16,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
 set -e
 
-# Prompt for base tag
+# Accept parameters from command line
 DEFAULT_TAG="latest"
-read -p "Enter the base tag to merge [${DEFAULT_TAG}]: " BASE_TAG
-BASE_TAG=${BASE_TAG:-$DEFAULT_TAG}
-
-# Prompt for which services' manifests to merge
 DEFAULT_SERVICES="*"
-read -p "Enter services to merge (comma-separated, '*' for all) [${DEFAULT_SERVICES}]: " SERVICES_INPUT
-SERVICES_INPUT=${SERVICES_INPUT:-$DEFAULT_SERVICES}
+
+BASE_TAG="${1:-$DEFAULT_TAG}"
+SERVICES_INPUT="${2:-$DEFAULT_SERVICES}"
+
+echo "Using base tag: $BASE_TAG"
+echo "Services to merge: $SERVICES_INPUT"
 
 # Convert input into array for lookup
 IFS=',' read -ra SELECTED_SERVICES <<< "$SERVICES_INPUT"
@@ -82,3 +81,8 @@ for svc in "${services[@]}"; do
 
   echo "✅ Created manifest: texera/$svc:$BASE_TAG"
 done
+
+echo ""
+echo "=========================================="
+echo "✅ All manifests merged successfully!"
+echo "=========================================="
\ No newline at end of file
diff --git a/deployment/postgres17-pgroonga.dockerfile b/bin/postgres17-pgroonga.dockerfile
similarity index 100%
rename from deployment/postgres17-pgroonga.dockerfile
rename to bin/postgres17-pgroonga.dockerfile
diff --git a/deployment/pylsp/Dockerfile b/bin/pylsp/Dockerfile
similarity index 91%
rename from deployment/pylsp/Dockerfile
rename to bin/pylsp/Dockerfile
index c2044369c6f..f02762b2dfb 100644
--- a/deployment/pylsp/Dockerfile
+++ b/bin/pylsp/Dockerfile
@@ -25,6 +25,7 @@ WORKDIR /usr/src/app
 RUN pip install python-lsp-server[all]==1.5.0 python-lsp-server[websockets] pylint==2.15.10
 RUN apt update
 RUN apt install -y htop
+RUN apt update && apt install -y --no-install-recommends bash htop
 
 # Copy the bash script into the container
 COPY run_pylsp.sh /usr/src/app/run_pylsp.sh
@@ -33,7 +34,7 @@ COPY run_pylsp.sh /usr/src/app/run_pylsp.sh
 RUN chmod +x /usr/src/app/run_pylsp.sh
 
 # Set the entrypoint to the script
-ENTRYPOINT ["/usr/src/app/run_pylsp.sh"]
+ENTRYPOINT ["/usr/bin/env", "bash", "/usr/src/app/run_pylsp.sh"]
 
 # Run pylsp on container startup
 # ENTRYPOINT ["pylsp", "--ws", "--port", "3000", "--verbose", "--check-parent-process"]
diff --git a/deployment/pylsp/python-language-server.yaml b/bin/pylsp/python-language-server.yaml
similarity index 100%
rename from deployment/pylsp/python-language-server.yaml
rename to bin/pylsp/python-language-server.yaml
diff --git a/deployment/pylsp/run_pylsp.sh b/bin/pylsp/run_pylsp.sh
similarity index 100%
rename from deployment/pylsp/run_pylsp.sh
rename to bin/pylsp/run_pylsp.sh
diff --git a/core/scripts/python-language-server.sh b/bin/python-language-service.sh
similarity index 97%
rename from core/scripts/python-language-server.sh
rename to bin/python-language-service.sh
index 8747ab12abd..253af374029 100755
--- a/core/scripts/python-language-server.sh
+++ b/bin/python-language-service.sh
@@ -26,7 +26,7 @@ PROVIDER=""
 PORT=""
 
 BASE_DIR=$(dirname "$0")
-PYRIGHT_DIR="$BASE_DIR/../pyright-language-server"
+PYRIGHT_DIR="$BASE_DIR/../pyright-language-service"
 
 while [ $# -gt 0 ]; do
   case "$1" in
diff --git a/core/scripts/python-proto-gen.sh b/bin/python-proto-gen.sh
similarity index 90%
rename from core/scripts/python-proto-gen.sh
rename to bin/python-proto-gen.sh
index a07eefc05f9..0faf33eb9b7 100755
--- a/core/scripts/python-proto-gen.sh
+++ b/bin/python-proto-gen.sh
@@ -18,12 +18,12 @@
 # assuming inside the pytexera executing Python ENV
 
 # dirs
-TEXERA_ROOT="$(git rev-parse --show-toplevel)"
-AMBER_DIR="$TEXERA_ROOT/core/amber"
+TEXERA_HOME="$(git rev-parse --show-toplevel)"
+AMBER_DIR="$TEXERA_HOME/amber"
 PYAMBER_DIR="$AMBER_DIR/src/main/python"
 PROTOBUF_AMBER_DIR="$AMBER_DIR/src/main/protobuf"
 
-CORE_DIR="$TEXERA_ROOT/core/workflow-core"
+CORE_DIR="$TEXERA_HOME/common/workflow-core"
 PROTOBUF_CORE_DIR="$CORE_DIR/src/main/protobuf"
 
 # proto-gen
diff --git a/core/scripts/server.sh b/bin/server.sh
similarity index 93%
rename from core/scripts/server.sh
rename to bin/server.sh
index 36818b14786..0320c7ea55f 100755
--- a/core/scripts/server.sh
+++ b/bin/server.sh
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd amber
-target/texera-*/bin/texera-web-application
\ No newline at end of file
+(cd amber && target/texera-*/bin/texera-web-application)
\ No newline at end of file
diff --git a/core/scripts/shared-editing-server.sh b/bin/shared-editing-server.sh
similarity index 95%
rename from core/scripts/shared-editing-server.sh
rename to bin/shared-editing-server.sh
index 47b108f9774..ad9f8b44775 100644
--- a/core/scripts/shared-editing-server.sh
+++ b/bin/shared-editing-server.sh
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd gui
-npx y-websocket
+(cd frontend && npx y-websocket)
diff --git a/deployment/single-node/.env b/bin/single-node/.env
similarity index 86%
rename from deployment/single-node/.env
rename to bin/single-node/.env
index 4b5d1d58364..f7a0d349bfc 100644
--- a/deployment/single-node/.env
+++ b/bin/single-node/.env
@@ -44,15 +44,6 @@ STORAGE_JDBC_USERNAME=texera
 STORAGE_JDBC_PASSWORD=password
 FILE_SERVICE_GET_PRESIGNED_URL_ENDPOINT=http://texera-file-service:9092/api/dataset/presign-download
 FILE_SERVICE_UPLOAD_ONE_FILE_TO_DATASET_ENDPOINT=http://texera-file-service:9092/api/dataset/did/upload
-USER_SYS_ENABLED=true
-STORAGE_ICEBERG_CATALOG_TYPE=postgres
 STORAGE_ICEBERG_CATALOG_POSTGRES_URI_WITHOUT_SCHEME=texera-postgres:5432/texera_iceberg_catalog
 STORAGE_ICEBERG_CATALOG_POSTGRES_USERNAME=texera
-STORAGE_ICEBERG_CATALOG_POSTGRES_PASSWORD=password
-
-# variables for example user, datasets and workflows
-TEXERA_EXAMPLE_USERNAME=texera
-TEXERA_EXAMPLE_PASSWORD=texera
-TEXERA_EXAMPLE_IS_PUBLIC=true
-TEXERA_EXAMPLE_DATASET_DIR=/example_data/data
-TEXERA_EXAMPLE_WORKFLOW_DIR=/example_data/workflows
\ No newline at end of file
+STORAGE_ICEBERG_CATALOG_POSTGRES_PASSWORD=password
\ No newline at end of file
diff --git a/deployment/single-node/README.md b/bin/single-node/README.md
similarity index 100%
rename from deployment/single-node/README.md
rename to bin/single-node/README.md
diff --git a/deployment/single-node/docker-compose.yml b/bin/single-node/docker-compose.yml
similarity index 71%
rename from deployment/single-node/docker-compose.yml
rename to bin/single-node/docker-compose.yml
index bd2394a8821..470053e8f79 100644
--- a/deployment/single-node/docker-compose.yml
+++ b/bin/single-node/docker-compose.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: texera-single-node-release-1-0-0
+name: texera-single-node-release-1-1-0-incubating
 services:
   # Part1: Specification of the storage services used by Texera
   # MinIO is an S3-compatible object storage used to store datasets and files.
@@ -46,7 +46,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
       # mount the sql files for initializing the postgres
-      - ../../core/scripts/sql:/docker-entrypoint-initdb.d
+      - ../../sql:/docker-entrypoint-initdb.d
 
   # lakeFS is the underlying storage of Texera's dataset service
   lakefs:
@@ -78,7 +78,7 @@ services:
   # Part2: Specification of Texera's micro-services
   # FileService provides endpoints for Texera's dataset management
   file-service:
-    image: texera/file-service:single-node-release-1-0-0
+    image: apache/texera-file-service:1.1.0-incubating
     container_name: texera-file-service
     restart: always
     depends_on:
@@ -94,9 +94,57 @@ services:
       timeout: 3s
       retries: 10
 
+  # ConfigService provides endpoints for configuration management
+  config-service:
+    image: apache/texera-config-service:1.1.0-incubating
+    container_name: texera-config-service
+    restart: always
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+      - .env
+    healthcheck:
+      test: ["CMD", "curl", "-sf", "http://localhost:9094/api/healthcheck"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+
+  # AccessControlService handles user permissions and access control
+  access-control-service:
+    image: apache/texera-access-control-service:1.1.0-incubating
+    container_name: texera-access-control-service
+    restart: always
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+      - .env
+    healthcheck:
+      test: ["CMD", "curl", "-sf", "http://localhost:9096/api/healthcheck"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+
+  # WorkflowComputingUnitManagingService provides endpoints for managing computing units
+  workflow-computing-unit-managing-service:
+    image: apache/texera-workflow-computing-unit-managing-service:1.1.0-incubating
+    container_name: texera-workflow-computing-unit-managing-service
+    restart: always
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+      - .env
+    healthcheck:
+      test: ["CMD", "curl", "-sf", "http://localhost:8888/api/healthcheck"]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+
   # WorkflowCompilingService provides endpoints for sanity check and schema propagation while workflows are being edited
   workflow-compiling-service:
-    image: texera/workflow-compiling-service:single-node-release-1-0-0
+    image: apache/texera-workflow-compiling-service:1.1.0-incubating
     container_name: texera-workflow-compiling-service
     restart: always
     depends_on:
@@ -112,8 +160,8 @@ services:
 
   # ComputingUnitMaster provides endpoints for executing workflows and interactions during executions.
   computing-unit-master:
-    # to enable R operators, change the image tag to single-node-release-1-0-0-R
-    image: texera/computing-unit-master:single-node-release-1-0-0
+    # to enable R operators, change the image tag to single-node-release-1-1-0-incubating-R
+    image: apache/texera-workflow-execution-coordinator:1.1.0-incubating
     container_name: texera-computing-unit-master
     restart: always
     depends_on:
@@ -122,11 +170,11 @@ services:
     env_file:
       - .env
     volumes:
-      - workflow_result_data:/core/amber/user-resources
+      - workflow_result_data:/amber/user-resources
 
   # TexeraWebApplication provides endpoints for hub resource management.
   texera-web-application:
-    image: texera/texera-web-application:single-node-release-1-0-0
+    image: apache/texera-dashboard-service:1.1.0-incubating
     container_name: texera-web-application
     restart: always
     depends_on:
@@ -139,49 +187,13 @@ services:
     env_file:
       - .env
     volumes:
-      - workflow_result_data:/core/amber/user-resources
+      - workflow_result_data:/amber/user-resources
     healthcheck:
       test: ["CMD", "curl", "-sf", "http://localhost:8080/api/healthcheck"]
       interval: 5s
       timeout: 3s
       retries: 10
 
-  texera-example-data-loader:
-    image: texera/texera-example-data-loader:single-node-release-1-0-0
-    container_name: texera-example-data-loader
-    depends_on:
-      texera-web-application:
-        condition: service_healthy
-    environment:
-      TEXERA_WEB_APPLICATION_URL: http://texera-web-application:8080/api
-      TEXERA_FILE_SERVICE_URL: http://texera-file-service:9092/api
-    restart: "no"
-
-  texera-access-message:
-    image: alpine:latest
-    container_name: texera-access-message
-    depends_on:
-      texera-example-data-loader:
-        condition: service_completed_successfully
-    env_file:
-      - .env
-    command: >
-      /bin/sh -c "
-        echo '===============================================';
-        echo 'Texera is ready!';
-        echo '===============================================';
-        echo '';
-        echo 'To access Texera, open your browser and navigate to:';
-        echo '    ${TEXERA_HOST}:8080';
-        echo '';
-        echo 'The following account has been created for you:';
-        echo '    Username: texera';
-        echo '    Password: texera';
-        echo '';
-        echo '==============================================='
-      "
-    restart: "no"
-
   # Part 3: reverse proxy service for Texera's micro services
   nginx:
     image: nginx:alpine
@@ -191,6 +203,9 @@ services:
       - file-service
       - texera-web-application
       - computing-unit-master
+      - config-service
+      - access-control-service
+      - workflow-computing-unit-managing-service
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     ports:
@@ -198,7 +213,7 @@ services:
 
 networks:
   default:
-    name: texera-single-node-release-1-0-0
+    name: texera-single-node-release-1-1-0-incubating
 
 # persistent volumes
 volumes:
diff --git a/deployment/single-node/nginx.conf b/bin/single-node/nginx.conf
similarity index 84%
rename from deployment/single-node/nginx.conf
rename to bin/single-node/nginx.conf
index f703fb027ff..4bdf8baf56b 100644
--- a/deployment/single-node/nginx.conf
+++ b/bin/single-node/nginx.conf
@@ -42,6 +42,18 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
         }
 
+        location /api/config {
+            proxy_pass http://texera-config-service:9094;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+        }
+
+        location /api/computing-unit {
+            proxy_pass http://texera-workflow-computing-unit-managing-service:8888;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+        }
+
         location /api/ {
             proxy_pass http://texera-web-application:8080;
             proxy_set_header Host $host;
diff --git a/core/scripts/terminate-daemon.sh b/bin/terminate-daemon.sh
similarity index 100%
rename from core/scripts/terminate-daemon.sh
rename to bin/terminate-daemon.sh
diff --git a/deployment/texera-web-application.dockerfile b/bin/texera-web-application.dockerfile
similarity index 61%
rename from deployment/texera-web-application.dockerfile
rename to bin/texera-web-application.dockerfile
index e94aa5cd18e..0b33a124483 100644
--- a/deployment/texera-web-application.dockerfile
+++ b/bin/texera-web-application.dockerfile
@@ -15,27 +15,30 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM node:18.17 AS build-gui
+FROM node:18.17 AS build-frontend
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         python3 build-essential git ca-certificates
 
-WORKDIR /gui
-COPY core/gui /gui
-RUN rm -f /gui/.yarnrc.yml
+WORKDIR /frontend
+COPY frontend /frontend
+RUN rm -f /frontend/.yarnrc.yml
 RUN corepack enable && corepack prepare yarn@4.5.1 --activate && yarn set version --yarn-path 4.5.1
-RUN echo "nodeLinker: node-modules" >> /gui/.yarnrc.yml
+RUN echo "nodeLinker: node-modules" >> /frontend/.yarnrc.yml
 
-WORKDIR /gui
+WORKDIR /frontend
 RUN yarn install && yarn run build
 
 FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
 
 # Set working directory
-WORKDIR /core
+WORKDIR /texera
 
-# Copy all projects under core to /core
-COPY core/ .
+# Copy modules for building the service
+COPY common/ common/
+COPY amber/ amber/
+COPY project/ project/
+COPY build.sbt build.sbt
 
 # Update system and install dependencies
 RUN apt-get update && apt-get install -y \
@@ -44,26 +47,25 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     && apt-get clean
 
-WORKDIR /core
 # Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
+COPY .git .git
 
 RUN sbt clean WorkflowExecutionService/dist
 
 # Unzip the texera binary
-RUN unzip amber/target/universal/texera-*.zip -d amber/target/
+RUN unzip amber/target/universal/amber-*.zip -d amber/target/
 
 FROM eclipse-temurin:11-jre-jammy AS runtime
 
-WORKDIR /core/amber
-# Copy built GUI files from the build-gui stage
-COPY --from=build-gui /gui/dist /core/gui/dist
+WORKDIR /texera/amber
+# Copy built frontend files from the build-frontend stage to match FileAssetsBundle path (../../frontend/dist from /texera/amber)
+COPY --from=build-frontend /frontend/dist /frontend/dist
 # Copy the built texera binary from the build phase
-COPY --from=build /.git /.git
-COPY --from=build /core/amber/target/texera-* /core/amber
-# Copy resources directories under /core from build phase
-COPY --from=build /core/amber/src/main/resources /core/amber/src/main/resources
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
+COPY --from=build /texera/.git /texera/amber/.git
+COPY --from=build /texera/amber/target/amber-* /texera/amber/
+# Copy resources directories from build phase
+COPY --from=build /texera/amber/src/main/resources /texera/amber/src/main/resources
+COPY --from=build /texera/common/config/src/main/resources /texera/amber/common/config/src/main/resources
 
 CMD ["bin/texera-web-application"]
 
diff --git a/bin/utils/resolve-texera-home.sh b/bin/utils/resolve-texera-home.sh
new file mode 100755
index 00000000000..ccc736c7b42
--- /dev/null
+++ b/bin/utils/resolve-texera-home.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# -------------------------------------------------------------
+# resolve-texera-home.sh
+# -------------------------------------------------------------
+# Determines TEXERA_HOME using the following priority:
+#   1. TEXERA_HOME environment variable (if already set)
+#   2. git repository root (if inside a git repo)
+#   3. parent directory if current dir is 'bin'
+#   4. current working directory (.)
+#
+# Prints the resolved TEXERA_HOME to stdout.
+# Logs human-readable messages via texera-logging.sh.
+#
+# Intended usage:
+#   TEXERA_HOME="$(bin/resolve-texera-home.sh)"
+#
+# Exits with code 1 if resolution fails.
+# -------------------------------------------------------------
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# --- Load logging helper ---
+# shellcheck source=bin/texera-logging.sh
+source "$SCRIPT_DIR/texera-logging.sh"
+
+resolve_texera_home() {
+  # 1. TEXERA_HOME environment variable
+  if [[ -n "${TEXERA_HOME:-}" ]]; then
+    tx_info "TEXERA_HOME found in environment: $TEXERA_HOME"
+    echo "$TEXERA_HOME"
+    return 0
+  fi
+
+  # 2. Git repository root (if any)
+  if git -C . rev-parse --show-toplevel >/dev/null 2>&1; then
+    local root
+    root="$(git rev-parse --show-toplevel)"
+    tx_info "TEXERA_HOME resolved via git repository root: $root"
+    echo "$root"
+    return 0
+  fi
+
+  # 3. Parent directory if current folder is 'bin'
+  local cwd cwd_basename
+  cwd="$(pwd)"
+  cwd_basename="$(basename "$cwd")"
+  if [[ "$cwd_basename" == "bin" ]]; then
+    local parent
+    parent="$(dirname "$cwd")"
+    tx_info "TEXERA_HOME resolved as parent of bin/: $parent"
+    echo "$parent"
+    return 0
+  fi
+
+  # 4. Fallback to current working directory
+  tx_warn "Falling back to current working directory as TEXERA_HOME: $cwd"
+  echo "$cwd"
+}
+
+# --- Main execution ---
+if ! resolve_texera_home; then
+  tx_error "Failed to resolve TEXERA_HOME."
+  exit 1
+fi
\ No newline at end of file
diff --git a/bin/utils/texera-logging.sh b/bin/utils/texera-logging.sh
new file mode 100755
index 00000000000..ad0dc9b1d75
--- /dev/null
+++ b/bin/utils/texera-logging.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# -------------------------------------------------------------
+# texera-logging.sh
+# -------------------------------------------------------------
+# Shared logging utilities for all Texera bash scripts.
+#
+# Features:
+#   • Colored, consistent logs prefixed with "Texera ▶"
+#   • Logs go to STDERR by default (so STDOUT stays clean)
+#   • Easy to override prefix or disable colors
+#
+# Env vars:
+#   TEXERA_LOG_PREFIX="Texera ▸"   # change prefix
+#   NO_COLOR=1                     # disable color
+#   TEXERA_LOG_TO_STDERR=0         # send to STDOUT instead
+# -------------------------------------------------------------
+
+# Prevent direct execution
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+  printf 'Texera ▶ This file must be sourced, not executed.\n' >&2
+  exit 1
+fi
+
+# --- Color setup ---
+_use_color=true
+if [[ -n "${NO_COLOR:-}" ]]; then
+  _use_color=false
+fi
+
+if $_use_color; then
+  readonly TL_COLOR_BLUE=$'\033[34m'
+  readonly TL_COLOR_GREEN=$'\033[32m'
+  readonly TL_COLOR_YELLOW=$'\033[33m'
+  readonly TL_COLOR_RED=$'\033[31m'
+  readonly TL_COLOR_BOLD=$'\033[1m'
+  readonly TL_COLOR_RESET=$'\033[0m'
+else
+  readonly TL_COLOR_BLUE="" TL_COLOR_GREEN="" TL_COLOR_YELLOW="" TL_COLOR_RED="" TL_COLOR_BOLD="" TL_COLOR_RESET=""
+fi
+
+# --- Prefix & output stream ---
+readonly TEXERA_LOG_PREFIX="${TEXERA_LOG_PREFIX:-Texera ▶}"
+readonly TL_PREFIX="${TL_COLOR_BOLD}${TEXERA_LOG_PREFIX}${TL_COLOR_RESET}"
+readonly _TL_TO_STDERR="${TEXERA_LOG_TO_STDERR:-1}"
+
+# --- Core emitter ---
+_tx_emit() {
+  local _color="$1"; shift
+  local _level="$1"; shift
+  if [[ "$_TL_TO_STDERR" == "1" ]]; then
+    printf '%s %s[%s]%s %s\n' "$TL_PREFIX" "$_color" "$_level" "$TL_COLOR_RESET" "$*" >&2
+  else
+    printf '%s %s[%s]%s %s\n' "$TL_PREFIX" "$_color" "$_level" "$TL_COLOR_RESET" "$*"
+  fi
+}
+
+# --- Public API ---
+tx_info()    { _tx_emit "$TL_COLOR_BLUE"   "INFO" "$*"; }
+tx_success() { _tx_emit "$TL_COLOR_GREEN"  "SUCCESS" "$*"; }
+tx_warn()    { _tx_emit "$TL_COLOR_YELLOW" "WARN" "$*"; }
+tx_error()   { _tx_emit "$TL_COLOR_RED"    "ERROR" "$*"; }
+
+export -f tx_info tx_success tx_warn tx_error
\ No newline at end of file
diff --git a/deployment/workflow-compiling-service.dockerfile b/bin/workflow-compiling-service.dockerfile
similarity index 70%
rename from deployment/workflow-compiling-service.dockerfile
rename to bin/workflow-compiling-service.dockerfile
index 95097521840..803cbe87de7 100644
--- a/deployment/workflow-compiling-service.dockerfile
+++ b/bin/workflow-compiling-service.dockerfile
@@ -18,10 +18,13 @@
 FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
 
 # Set working directory
-WORKDIR /core
+WORKDIR /texera
 
-# Copy all projects under core to /core
-COPY core/ .
+# Copy modules for building the service
+COPY common/ common/
+COPY workflow-compiling-service/ workflow-compiling-service/
+COPY project/ project/
+COPY build.sbt build.sbt
 
 # Update system and install dependencies
 RUN apt-get update && apt-get install -y \
@@ -30,9 +33,8 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     && apt-get clean
 
-WORKDIR /core
 # Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
+COPY .git .git
 
 RUN sbt clean WorkflowCompilingService/dist
 
@@ -41,14 +43,14 @@ RUN unzip workflow-compiling-service/target/universal/workflow-compiling-service
 
 FROM eclipse-temurin:11-jre-jammy AS runtime
 
-WORKDIR /core
+WORKDIR /texera
 
 # Copy the built texera binary from the build phase
-COPY --from=build /.git /.git
-COPY --from=build /core/target/workflow-compiling-service-* /core/
-# Copy resources directories under /core from build phase
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
-COPY --from=build /core/workflow-compiling-service/src/main/resources /core/workflow-compiling-service/src/main/resources
+COPY --from=build /texera/.git /texera/.git
+COPY --from=build /texera/target/workflow-compiling-service-* /texera/
+# Copy resources directories from build phase
+COPY --from=build /texera/common/config/src/main/resources /texera/common/config/src/main/resources
+COPY --from=build /texera/workflow-compiling-service/src/main/resources /texera/workflow-compiling-service/src/main/resources
 
 CMD ["bin/workflow-compiling-service"]
 
diff --git a/core/scripts/workflow-compiling-service.sh b/bin/workflow-compiling-service.sh
similarity index 100%
rename from core/scripts/workflow-compiling-service.sh
rename to bin/workflow-compiling-service.sh
diff --git a/deployment/workflow-computing-unit-managing-service.dockerfile b/bin/workflow-computing-unit-managing-service.dockerfile
similarity index 64%
rename from deployment/workflow-computing-unit-managing-service.dockerfile
rename to bin/workflow-computing-unit-managing-service.dockerfile
index f98732d6bdd..30924c8687e 100644
--- a/deployment/workflow-computing-unit-managing-service.dockerfile
+++ b/bin/workflow-computing-unit-managing-service.dockerfile
@@ -18,10 +18,13 @@
 FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
 
 # Set working directory
-WORKDIR /core
+WORKDIR /texera
 
-# Copy all projects under core to /core
-COPY core/ .
+# Copy modules for building the service
+COPY common/ common/
+COPY computing-unit-managing-service/ computing-unit-managing-service/
+COPY project/ project/
+COPY build.sbt build.sbt
 
 # Update system and install dependencies
 RUN apt-get update && apt-get install -y \
@@ -30,25 +33,24 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     && apt-get clean
 
-WORKDIR /core
 # Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
+COPY .git .git
 
 RUN sbt clean ComputingUnitManagingService/dist
 
 # Unzip the texera binary
-RUN unzip  computing-unit-managing-service/target/universal/computing-unit-managing-service-*.zip -d target/
+RUN unzip computing-unit-managing-service/target/universal/computing-unit-managing-service-*.zip -d target/
 
 FROM eclipse-temurin:11-jre-jammy AS runtime
 
-WORKDIR /core
+WORKDIR /texera
 
-COPY --from=build /.git /.git
+COPY --from=build /texera/.git /texera/.git
 # Copy the built texera binary from the build phase
-COPY --from=build /core/target/computing-unit-managing-service-* /core/
-# Copy resources directories under /core from build phase
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
-COPY --from=build /core/computing-unit-managing-service/src/main/resources /core/computing-unit-managing-service/src/main/resources
+COPY --from=build /texera/target/computing-unit-managing-service-* /texera/
+# Copy resources directories from build phase
+COPY --from=build /texera/common/config/src/main/resources /texera/common/config/src/main/resources
+COPY --from=build /texera/computing-unit-managing-service/src/main/resources /texera/computing-unit-managing-service/src/main/resources
 
 CMD ["bin/computing-unit-managing-service"]
 
diff --git a/core/scripts/workflow-computing-unit.sh b/bin/workflow-computing-unit.sh
similarity index 82%
rename from core/scripts/workflow-computing-unit.sh
rename to bin/workflow-computing-unit.sh
index e0e8d126729..2fade50b9bb 100755
--- a/core/scripts/workflow-computing-unit.sh
+++ b/bin/workflow-computing-unit.sh
@@ -15,10 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cd amber
-if [ ! -z $1 ]
-then
-    target/texera-*/bin/computing-unit-master --cluster $1
-else
-    target/texera-*/bin/computing-unit-master
-fi
\ No newline at end of file
+(
+  cd amber &&
+  if [ ! -z $1 ]
+  then
+      target/texera-*/bin/computing-unit-master --cluster $1
+  else
+      target/texera-*/bin/computing-unit-master
+  fi
+)
\ No newline at end of file
diff --git a/deployment/y-websocket-server/Dockerfile b/bin/y-websocket-server/Dockerfile
similarity index 100%
rename from deployment/y-websocket-server/Dockerfile
rename to bin/y-websocket-server/Dockerfile
diff --git a/deployment/y-websocket-server/package.json b/bin/y-websocket-server/package.json
similarity index 100%
rename from deployment/y-websocket-server/package.json
rename to bin/y-websocket-server/package.json
diff --git a/core/build.sbt b/build.sbt
similarity index 76%
rename from core/build.sbt
rename to build.sbt
index 3e2e150ac9e..027775ff253 100644
--- a/core/build.sbt
+++ b/build.sbt
@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-lazy val DAO = project in file("dao")
-lazy val Config = project in file("config")
-lazy val Auth = (project in file("auth"))
+lazy val DAO = project in file("common/dao")
+lazy val Config = project in file("common/config")
+lazy val Auth = (project in file("common/auth"))
   .dependsOn(DAO, Config)
 lazy val ConfigService = (project in file("config-service"))
   .dependsOn(Auth, Config)
@@ -37,7 +37,7 @@ lazy val AccessControlService = (project in file("access-control-service"))
   )
   .configs(Test)
   .dependsOn(DAO % "test->test", Auth % "test->test")
-lazy val WorkflowCore = (project in file("workflow-core"))
+lazy val WorkflowCore = (project in file("common/workflow-core"))
   .dependsOn(DAO, Config)
   .configs(Test)
   .dependsOn(DAO % "test->test") // test scope dependency
@@ -62,7 +62,7 @@ lazy val FileService = (project in file("file-service"))
     )
   )
 
-lazy val WorkflowOperator = (project in file("workflow-operator")).dependsOn(WorkflowCore)
+lazy val WorkflowOperator = (project in file("common/workflow-operator")).dependsOn(WorkflowCore)
 lazy val WorkflowCompilingService = (project in file("workflow-compiling-service"))
   .dependsOn(WorkflowOperator, Config)
   .settings(
@@ -84,7 +84,19 @@ lazy val WorkflowExecutionService = (project in file("amber"))
       "org.slf4j" % "slf4j-api" % "1.7.26",
       "org.eclipse.jetty" % "jetty-server" % "9.4.20.v20190813",
       "org.eclipse.jetty" % "jetty-servlet" % "9.4.20.v20190813",
-      "org.eclipse.jetty" % "jetty-http" % "9.4.20.v20190813"
+      "org.eclipse.jetty" % "jetty-http" % "9.4.20.v20190813",
+      // Netty dependency overrides to ensure compatibility with Arrow 14.0.1
+      // Arrow requires Netty 4.1.96.Final to avoid NoSuchFieldError: chunkSize
+      "io.netty" % "netty-all" % "4.1.96.Final",
+      "io.netty" % "netty-buffer" % "4.1.96.Final",
+      "io.netty" % "netty-codec" % "4.1.96.Final",
+      "io.netty" % "netty-codec-http" % "4.1.96.Final",
+      "io.netty" % "netty-codec-http2" % "4.1.96.Final",
+      "io.netty" % "netty-common" % "4.1.96.Final",
+      "io.netty" % "netty-handler" % "4.1.96.Final",
+      "io.netty" % "netty-resolver" % "4.1.96.Final",
+      "io.netty" % "netty-transport" % "4.1.96.Final",
+      "io.netty" % "netty-transport-native-unix-common" % "4.1.96.Final"
     ),
     libraryDependencies ++= Seq(
       "com.squareup.okhttp3" % "okhttp" % "4.10.0" force () // Force usage of OkHttp 4.10.0
@@ -94,11 +106,12 @@ lazy val WorkflowExecutionService = (project in file("amber"))
   .dependsOn(DAO % "test->test", Auth % "test->test") // test scope dependency
 
 // root project definition
-lazy val CoreProject = (project in file("."))
+lazy val TexeraProject = (project in file("."))
   .aggregate(
     DAO,
     Config,
     ConfigService,
+    AccessControlService,
     Auth,
     WorkflowCore,
     ComputingUnitManagingService,
@@ -108,9 +121,9 @@ lazy val CoreProject = (project in file("."))
     WorkflowExecutionService
   )
   .settings(
-    name := "core",
-    version := "1.0.0",
-    organization := "edu.uci.ics",
+    name := "texera",
+    version := "1.1.0-incubating",
+    organization := "org.apache",
     scalaVersion := "2.13.12",
     publishMavenStyle := true
   )
diff --git a/core/auth/build.sbt b/common/auth/build.sbt
similarity index 98%
rename from core/auth/build.sbt
rename to common/auth/build.sbt
index 37c540bb4c2..a89812d80c8 100644
--- a/core/auth/build.sbt
+++ b/common/auth/build.sbt
@@ -20,7 +20,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 name := "auth"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
diff --git a/core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtAuth.scala b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala
similarity index 94%
rename from core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtAuth.scala
rename to common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala
index 78bd374eb63..6e099a1f36b 100644
--- a/core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtAuth.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuth.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.auth
+package org.apache.texera.auth
 
-import edu.uci.ics.texera.config.AuthConfig
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.config.AuthConfig
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
 import org.jose4j.jws.AlgorithmIdentifiers.HMAC_SHA256
 import org.jose4j.jws.JsonWebSignature
 import org.jose4j.jwt.JwtClaims
diff --git a/core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtAuthFilter.scala b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
similarity index 92%
rename from core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtAuthFilter.scala
rename to common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
index 514a6eba155..10c498951c9 100644
--- a/core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtAuthFilter.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
@@ -17,17 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.auth
+package org.apache.texera.auth
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
 import jakarta.ws.rs.container.{ContainerRequestContext, ContainerRequestFilter, ResourceInfo}
 import jakarta.ws.rs.core.{Context, HttpHeaders, SecurityContext}
 import jakarta.ws.rs.ext.Provider
-import edu.uci.ics.texera.dao.jooq.generated.Tables.USER_LAST_ACTIVE_TIME
-import java.time.OffsetDateTime
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.Tables.USER_LAST_ACTIVE_TIME
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+
 import java.security.Principal
+import java.time.OffsetDateTime
 
 @Provider
 class JwtAuthFilter extends ContainerRequestFilter with LazyLogging {
diff --git a/core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtParser.scala b/common/auth/src/main/scala/org/apache/texera/auth/JwtParser.scala
similarity index 90%
rename from core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtParser.scala
rename to common/auth/src/main/scala/org/apache/texera/auth/JwtParser.scala
index 09819475c74..48c6bacafc7 100644
--- a/core/auth/src/main/scala/edu/uci/ics/texera/auth/JwtParser.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/JwtParser.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.auth
+package org.apache.texera.auth
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.texera.config.AuthConfig
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.config.AuthConfig
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
 import org.jose4j.jwt.JwtClaims
 import org.jose4j.jwt.consumer.{JwtConsumer, JwtConsumerBuilder}
 import org.jose4j.keys.HmacKey
@@ -52,7 +52,7 @@ object JwtParser extends LazyLogging {
       val role = UserRoleEnum.valueOf(jwtClaims.getClaimValue("role").asInstanceOf[String])
       val googleId = jwtClaims.getClaimValue("googleId", classOf[String])
 
-      val user = new User(userId, userName, email, null, googleId, null, role, null, null)
+      val user = new User(userId, userName, email, null, googleId, null, role, null, null, null)
       Optional.of(new SessionUser(user))
     } catch {
       case _: UnresolvableKeyException =>
diff --git a/core/auth/src/main/scala/edu/uci/ics/texera/auth/SessionUser.scala b/common/auth/src/main/scala/org/apache/texera/auth/SessionUser.scala
similarity index 87%
rename from core/auth/src/main/scala/edu/uci/ics/texera/auth/SessionUser.scala
rename to common/auth/src/main/scala/org/apache/texera/auth/SessionUser.scala
index bc1ab8e8b9d..709eef1daff 100644
--- a/core/auth/src/main/scala/edu/uci/ics/texera/auth/SessionUser.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/SessionUser.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.auth
+package org.apache.texera.auth
 
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.User
 
 import java.security.Principal
 
diff --git a/core/auth/src/main/scala/edu/uci/ics/texera/auth/util/ComputingUnitAccess.scala b/common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
similarity index 88%
rename from core/auth/src/main/scala/edu/uci/ics/texera/auth/util/ComputingUnitAccess.scala
rename to common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
index c529edf8ece..14dd68e0a07 100644
--- a/core/auth/src/main/scala/edu/uci/ics/texera/auth/util/ComputingUnitAccess.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
@@ -15,15 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package edu.uci.ics.texera.auth.util
+package org.apache.texera.auth.util
 
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   ComputingUnitUserAccessDao,
   WorkflowComputingUnitDao
 }
-import ComputingUnitAccess._
 import org.jooq.DSLContext
 
 import scala.jdk.CollectionConverters._
diff --git a/core/auth/src/main/scala/edu/uci/ics/texera/auth/util/HeaderField.scala b/common/auth/src/main/scala/org/apache/texera/auth/util/HeaderField.scala
similarity index 96%
rename from core/auth/src/main/scala/edu/uci/ics/texera/auth/util/HeaderField.scala
rename to common/auth/src/main/scala/org/apache/texera/auth/util/HeaderField.scala
index 2b98989737f..48218f782fb 100644
--- a/core/auth/src/main/scala/edu/uci/ics/texera/auth/util/HeaderField.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/util/HeaderField.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.auth.util
+package org.apache.texera.auth.util
 
 object HeaderField {
   val UserComputingUnitAccess = "x-user-computing-unit-access"
diff --git a/core/config/build.sbt b/common/config/build.sbt
similarity index 98%
rename from core/config/build.sbt
rename to common/config/build.sbt
index 8917c7a102a..8a049491a94 100644
--- a/core/config/build.sbt
+++ b/common/config/build.sbt
@@ -18,7 +18,7 @@
 import scala.collection.Seq
 
 name := "config"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
diff --git a/core/config/src/main/resources/application.conf b/common/config/src/main/resources/application.conf
similarity index 98%
rename from core/config/src/main/resources/application.conf
rename to common/config/src/main/resources/application.conf
index 4d372fa847f..62daee86796 100644
--- a/core/config/src/main/resources/application.conf
+++ b/common/config/src/main/resources/application.conf
@@ -94,7 +94,7 @@ web-server {
 fault-tolerance {
     # URI for storage, empty to disable logging.
     # Use absolute path only. for local file system, $AMBER_FOLDER will be interpolated to Amber folder path.
-    # e.g. use "file://$AMBER_FOLDER/../log/recovery-logs/" for local logging.
+    # e.g. use "file://$AMBER_FOLDER/logs/recovery-logs/" for local logging.
     log-storage-uri = ""
     log-storage-uri = ${?FAULT_TOLERANCE_LOG_STORAGE_URI}
 
diff --git a/core/config/src/main/resources/auth.conf b/common/config/src/main/resources/auth.conf
similarity index 100%
rename from core/config/src/main/resources/auth.conf
rename to common/config/src/main/resources/auth.conf
diff --git a/core/config/src/main/resources/cluster.conf b/common/config/src/main/resources/cluster.conf
similarity index 81%
rename from core/config/src/main/resources/cluster.conf
rename to common/config/src/main/resources/cluster.conf
index 8069a0e673c..adf42fccde8 100644
--- a/core/config/src/main/resources/cluster.conf
+++ b/common/config/src/main/resources/cluster.conf
@@ -15,10 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-akka {
-    # Loggers to register at boot time (akka.event.Logging$DefaultLogger logs
+pekko {
+    # Loggers to register at boot time (pekko.event.Logging$DefaultLogger logs
     # to STDOUT)
-    loggers = ["akka.event.slf4j.Slf4jLogger"]
+    loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
 
     # Log level used by the configured loggers (see "loggers") as soon
     # as they have been started; before that, see "stdout-loglevel"
@@ -32,18 +32,18 @@ akka {
 
     # Filter of log events that is used by the LoggingAdapter before
     # publishing log events to the eventStream.
-    logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+    logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
 
     actor {
         provider = cluster
         enable-additional-serialization-bindings = on
         allow-java-serialization = off
         serializers {
-            kryo = "io.altoo.akka.serialization.kryo.KryoSerializer"
+            kryo = "io.altoo.serialization.kryo.pekko.PekkoKryoSerializer"
         }
         serialization-bindings {
             "java.io.Serializable" = kryo
-            "java.lang.Throwable" = akka-misc
+            "java.lang.Throwable" = pekko-misc
         }
     }
 
@@ -62,7 +62,7 @@ akka {
         # auto downing is NOT safe for production deployments.
         # you may want to use it during development, read more about it in the docs.
         auto-down-unreachable-after = off
-        downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+        downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
         unreachable-nodes-reaper-interval = 5s
         gossip-interval = 10s
         leader-actions-interval = 10s
@@ -76,4 +76,4 @@ akka {
     }
 }
 
-akka-kryo-serialization.kryo-initializer = "edu.uci.ics.amber.engine.common.AmberKryoInitializer"
\ No newline at end of file
+pekko-kryo-serialization.kryo-initializer = "org.apache.texera.amber.engine.common.AmberKryoInitializer"
diff --git a/core/config/src/main/resources/computing-unit.conf b/common/config/src/main/resources/computing-unit.conf
similarity index 100%
rename from core/config/src/main/resources/computing-unit.conf
rename to common/config/src/main/resources/computing-unit.conf
diff --git a/core/config/src/main/resources/default.conf b/common/config/src/main/resources/default.conf
similarity index 100%
rename from core/config/src/main/resources/default.conf
rename to common/config/src/main/resources/default.conf
diff --git a/core/config/src/main/resources/gui.conf b/common/config/src/main/resources/gui.conf
similarity index 88%
rename from core/config/src/main/resources/gui.conf
rename to common/config/src/main/resources/gui.conf
index 9619707d55a..8039441b130 100644
--- a/core/config/src/main/resources/gui.conf
+++ b/common/config/src/main/resources/gui.conf
@@ -18,12 +18,12 @@
 # This file is used to configure the GUI shown in users' browser.
 # To add a new configuration:
 #   1. Add a new property, its default value and the environment variable name in the gui section in this file
-#   2. Add the corresponding parsing logic in core/config/src/main/scala/edu/uci/ics/texera/config/GuiConfig.scala
-#   3. Add the sending logic in core/src/main/scala/edu/uci/ics/texera/web/resource/UserConfigResource.scala
-#   4. Add the frontend definition in core/gui/src/app/common/type/gui-config.ts and core/gui/src/app/common/service/gui-config.service.mock.ts
+#   2. Add the corresponding parsing logic in core/config/src/main/scala/org/apache/texera/config/GuiConfig.scala
+#   3. Add the sending logic in core/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
+#   4. Add the frontend definition in frontend/src/app/common/type/gui-config.ts and frontend/src/app/common/service/gui-config.service.mock.ts
 # To change the default value of a configuration:
 #   1. Change the default value in the gui section in this file
-#   2. Change the default value in core/gui/src/app/common/service/gui-config.service.mock.ts
+#   2. Change the default value in frontend/src/app/common/service/gui-config.service.mock.ts
 gui {
   login {
     # whether local login is enabled
@@ -104,5 +104,13 @@ gui {
     # amount of time to be elapsed in minutes before user is detected as inactive
     active-time-in-minutes = 15
     active-time-in-minutes = ${?GUI_WORKFLOW_WORKSPACE_ACTIVE_TIME_IN_MINUTES}
+
+    # whether AI copilot feature is enabled
+    copilot-enabled = false
+    copilot-enabled = ${?GUI_WORKFLOW_WORKSPACE_COPILOT_ENABLED}
+
+    # the limit of columns to be displayed in the result table
+    limit-columns = 15
+    limit-columns = ${?GUI_WORKFLOW_WORKSPACE_LIMIT_COLUMNS}
   }
 }
\ No newline at end of file
diff --git a/core/config/src/main/resources/kubernetes.conf b/common/config/src/main/resources/kubernetes.conf
similarity index 100%
rename from core/config/src/main/resources/kubernetes.conf
rename to common/config/src/main/resources/kubernetes.conf
diff --git a/common/config/src/main/resources/llm.conf b/common/config/src/main/resources/llm.conf
new file mode 100644
index 00000000000..23b9360cdab
--- /dev/null
+++ b/common/config/src/main/resources/llm.conf
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# LLM Configuration
+llm {
+  # Base URL for LiteLLM service
+  base-url = "http://0.0.0.0:4000"
+  base-url = ${?LITELLM_BASE_URL}
+
+  # Master key for LiteLLM authentication
+  master-key = ""
+  master-key = ${?LITELLM_MASTER_KEY}
+}
diff --git a/core/config/src/main/resources/storage.conf b/common/config/src/main/resources/storage.conf
similarity index 91%
rename from core/config/src/main/resources/storage.conf
rename to common/config/src/main/resources/storage.conf
index 7aba655b461..85a62b77a3b 100644
--- a/core/config/src/main/resources/storage.conf
+++ b/common/config/src/main/resources/storage.conf
@@ -125,6 +125,12 @@ storage {
         url = "jdbc:postgresql://localhost:5432/texera_db?currentSchema=texera_db,public"
         url = ${?STORAGE_JDBC_URL}
 
+        # Some e2e test cases require the user system. To make sure running those test cases can pass the CI, and that
+        # running them locally do not contaminate developers' own texera_db, we use another database with a different
+        # name for running these test cases.
+        url-for-test-cases = "jdbc:postgresql://localhost:5432/texera_db_for_test_cases?currentSchema=texera_db,public"
+        url-for-test-cases = ${?STORAGE_JDBC_URL_FOR_TEST_CASES}
+
         username = "postgres"
         username = ${?STORAGE_JDBC_USERNAME}
 
diff --git a/core/config/src/main/resources/udf.conf b/common/config/src/main/resources/udf.conf
similarity index 100%
rename from core/config/src/main/resources/udf.conf
rename to common/config/src/main/resources/udf.conf
diff --git a/core/config/src/main/resources/user-system.conf b/common/config/src/main/resources/user-system.conf
similarity index 96%
rename from core/config/src/main/resources/user-system.conf
rename to common/config/src/main/resources/user-system.conf
index aa7d65a3332..166ce2fc8f0 100644
--- a/core/config/src/main/resources/user-system.conf
+++ b/common/config/src/main/resources/user-system.conf
@@ -17,9 +17,6 @@
 
 # See PR https://github.com/Texera/texera/pull/3326 for configuration guidelines.
 user-sys {
-  enabled = false
-  enabled = ${?USER_SYS_ENABLED}
-
   admin-username = "texera"
   admin-username = ${?USER_SYS_ADMIN_USERNAME}
 
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/config/AkkaConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/AkkaConfig.scala
similarity index 89%
rename from core/config/src/main/scala/edu/uci/ics/amber/config/AkkaConfig.scala
rename to common/config/src/main/scala/org/apache/texera/amber/config/AkkaConfig.scala
index 66b69a258da..7f2097063a9 100644
--- a/core/config/src/main/scala/edu/uci/ics/amber/config/AkkaConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/amber/config/AkkaConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.config
+package org.apache.texera.amber.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
@@ -25,6 +25,6 @@ object AkkaConfig {
   // Load configuration
   private val conf: Config = ConfigFactory.parseResources("cluster.conf").resolve()
 
-  // Return the complete Akka configuration with fallback to default application config
+  // Return the complete Pekko configuration with fallback to default application config
   def akkaConfig: Config = conf.withFallback(ConfigFactory.defaultApplication()).resolve()
 }
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/config/ApplicationConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala
similarity index 99%
rename from core/config/src/main/scala/edu/uci/ics/amber/config/ApplicationConfig.scala
rename to common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala
index e9eb0f3968d..415a23d23c3 100644
--- a/core/config/src/main/scala/edu/uci/ics/amber/config/ApplicationConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.config
+package org.apache.texera.amber.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/config/EnvironmentalVariable.scala b/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala
similarity index 99%
rename from core/config/src/main/scala/edu/uci/ics/amber/config/EnvironmentalVariable.scala
rename to common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala
index f186050c3b6..099e12260d2 100644
--- a/core/config/src/main/scala/edu/uci/ics/amber/config/EnvironmentalVariable.scala
+++ b/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.config
+package org.apache.texera.amber.config
 
 // Environment variable names for all the *.conf files
 // TODO: currently these values are hard-coded, it would be good to have a way to dynamically load these names to avoid 2-copy
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala
similarity index 94%
rename from core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala
rename to common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala
index fd369fbb5b6..c5bd3302862 100644
--- a/core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala
@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.config
+package org.apache.texera.amber.config
 
 import com.typesafe.config.{Config, ConfigFactory}
-import edu.uci.ics.amber.util.ConfigParserUtil.parseSizeStringToBytes
-import edu.uci.ics.amber.util.PathUtils.corePath
+import org.apache.texera.amber.util.ConfigParserUtil.parseSizeStringToBytes
 
 import java.nio.file.Path
 
@@ -34,6 +33,7 @@ object StorageConfig {
 
   // JDBC specifics
   val jdbcUrl: String = conf.getString("storage.jdbc.url")
+  val jdbcUrlForTestCases: String = conf.getString("storage.jdbc.url-for-test-cases")
   val jdbcUsername: String = conf.getString("storage.jdbc.username")
   val jdbcPassword: String = conf.getString("storage.jdbc.password")
 
@@ -85,7 +85,11 @@ object StorageConfig {
 
   // File storage configurations
   val fileStorageDirectoryPath: Path =
-    corePath.resolve("amber").resolve("user-resources").resolve("workflow-results")
+    Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("amber")
+      .resolve("user-resources")
+      .resolve("workflow-results")
 
   // JDBC
   val ENV_JDBC_URL = "STORAGE_JDBC_URL"
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/config/UdfConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala
similarity index 97%
rename from core/config/src/main/scala/edu/uci/ics/amber/config/UdfConfig.scala
rename to common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala
index 3c3b60fb792..2c4035d2224 100644
--- a/core/config/src/main/scala/edu/uci/ics/amber/config/UdfConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.config
+package org.apache.texera.amber.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/util/ConfigParserUtil.scala b/common/config/src/main/scala/org/apache/texera/amber/util/ConfigParserUtil.scala
similarity index 97%
rename from core/config/src/main/scala/edu/uci/ics/amber/util/ConfigParserUtil.scala
rename to common/config/src/main/scala/org/apache/texera/amber/util/ConfigParserUtil.scala
index f01e2f934ce..b1a90cd6125 100644
--- a/core/config/src/main/scala/edu/uci/ics/amber/util/ConfigParserUtil.scala
+++ b/common/config/src/main/scala/org/apache/texera/amber/util/ConfigParserUtil.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
 object ConfigParserUtil {
   def parseSizeStringToBytes(size: String): Long = {
diff --git a/core/config/src/main/scala/edu/uci/ics/texera/config/AuthConfig.scala b/common/config/src/main/scala/org/apache/texera/config/AuthConfig.scala
similarity index 98%
rename from core/config/src/main/scala/edu/uci/ics/texera/config/AuthConfig.scala
rename to common/config/src/main/scala/org/apache/texera/config/AuthConfig.scala
index 559938e51db..e62863470cd 100644
--- a/core/config/src/main/scala/edu/uci/ics/texera/config/AuthConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/config/AuthConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.config
+package org.apache.texera.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
diff --git a/core/config/src/main/scala/edu/uci/ics/texera/config/ComputingUnitConfig.scala b/common/config/src/main/scala/org/apache/texera/config/ComputingUnitConfig.scala
similarity index 97%
rename from core/config/src/main/scala/edu/uci/ics/texera/config/ComputingUnitConfig.scala
rename to common/config/src/main/scala/org/apache/texera/config/ComputingUnitConfig.scala
index da4d58308d3..5d4e3ae7500 100644
--- a/core/config/src/main/scala/edu/uci/ics/texera/config/ComputingUnitConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/config/ComputingUnitConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.config
+package org.apache.texera.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
diff --git a/core/config/src/main/scala/edu/uci/ics/texera/config/DefaultsConfig.scala b/common/config/src/main/scala/org/apache/texera/config/DefaultsConfig.scala
similarity index 97%
rename from core/config/src/main/scala/edu/uci/ics/texera/config/DefaultsConfig.scala
rename to common/config/src/main/scala/org/apache/texera/config/DefaultsConfig.scala
index 13c6490408e..7e3b94a79b3 100644
--- a/core/config/src/main/scala/edu/uci/ics/texera/config/DefaultsConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/config/DefaultsConfig.scala
@@ -16,9 +16,10 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.config
+package org.apache.texera.config
 
 import com.typesafe.config.{ConfigFactory, ConfigRenderOptions, ConfigValueType}
+
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 
 object DefaultsConfig {
diff --git a/core/config/src/main/scala/edu/uci/ics/texera/config/GuiConfig.scala b/common/config/src/main/scala/org/apache/texera/config/GuiConfig.scala
similarity index 93%
rename from core/config/src/main/scala/edu/uci/ics/texera/config/GuiConfig.scala
rename to common/config/src/main/scala/org/apache/texera/config/GuiConfig.scala
index 65951afa5ee..14016f43743 100644
--- a/core/config/src/main/scala/edu/uci/ics/texera/config/GuiConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/config/GuiConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.config
+package org.apache.texera.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
@@ -67,4 +67,8 @@ object GuiConfig {
     conf.getBoolean("gui.workflow-workspace.workflow-email-notification-enabled")
   val guiWorkflowWorkspaceActiveTimeInMinutes: Int =
     conf.getInt("gui.workflow-workspace.active-time-in-minutes")
+  val guiWorkflowWorkspaceCopilotEnabled: Boolean =
+    conf.getBoolean("gui.workflow-workspace.copilot-enabled")
+  val guiWorkflowWorkspaceLimitColumns: Int =
+    conf.getInt("gui.workflow-workspace.limit-columns")
 }
diff --git a/core/config/src/main/scala/edu/uci/ics/texera/config/KubernetesConfig.scala b/common/config/src/main/scala/org/apache/texera/config/KubernetesConfig.scala
similarity index 98%
rename from core/config/src/main/scala/edu/uci/ics/texera/config/KubernetesConfig.scala
rename to common/config/src/main/scala/org/apache/texera/config/KubernetesConfig.scala
index d179618e957..7f8763e8946 100644
--- a/core/config/src/main/scala/edu/uci/ics/texera/config/KubernetesConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/config/KubernetesConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.config
+package org.apache.texera.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
diff --git a/common/config/src/main/scala/org/apache/texera/config/LLMConfig.scala b/common/config/src/main/scala/org/apache/texera/config/LLMConfig.scala
new file mode 100644
index 00000000000..a85b734bad6
--- /dev/null
+++ b/common/config/src/main/scala/org/apache/texera/config/LLMConfig.scala
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.texera.config
+
+import com.typesafe.config.{Config, ConfigFactory}
+
+object LLMConfig {
+  private val conf: Config = ConfigFactory.parseResources("llm.conf").resolve()
+
+  // LLM Service Configuration
+  val baseUrl: String = conf.getString("llm.base-url")
+  val masterKey: String = conf.getString("llm.master-key")
+}
diff --git a/core/config/src/main/scala/edu/uci/ics/texera/config/UserSystemConfig.scala b/common/config/src/main/scala/org/apache/texera/config/UserSystemConfig.scala
similarity index 95%
rename from core/config/src/main/scala/edu/uci/ics/texera/config/UserSystemConfig.scala
rename to common/config/src/main/scala/org/apache/texera/config/UserSystemConfig.scala
index d64ee7ff4c8..81f6b59566e 100644
--- a/core/config/src/main/scala/edu/uci/ics/texera/config/UserSystemConfig.scala
+++ b/common/config/src/main/scala/org/apache/texera/config/UserSystemConfig.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.config
+package org.apache.texera.config
 
 import com.typesafe.config.{Config, ConfigFactory}
 
@@ -27,7 +27,6 @@ object UserSystemConfig {
   private val logger = Logger.getLogger(getClass.getName)
 
   // User system
-  val isUserSystemEnabled: Boolean = conf.getBoolean("user-sys.enabled")
   val adminUsername: String = conf.getString("user-sys.admin-username")
   val adminPassword: String = conf.getString("user-sys.admin-password")
   val googleClientId: String = conf.getString("user-sys.google.clientId")
diff --git a/common/dao/.gitignore b/common/dao/.gitignore
new file mode 100644
index 00000000000..4d67db7d132
--- /dev/null
+++ b/common/dao/.gitignore
@@ -0,0 +1 @@
+src/main/scala/org/apache/texera/dao/jooq/
\ No newline at end of file
diff --git a/core/dao/build.sbt b/common/dao/build.sbt
similarity index 98%
rename from core/dao/build.sbt
rename to common/dao/build.sbt
index 1907eb8142f..5bedbe44a94 100644
--- a/core/dao/build.sbt
+++ b/common/dao/build.sbt
@@ -20,7 +20,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 name := "dao"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 scalaVersion := "2.13.12"
 
@@ -51,8 +51,9 @@ jooqGenerate := {
     import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions}
     import org.jooq.codegen.GenerationTool
     import org.jooq.meta.jaxb.{Configuration, Jdbc}
-    import java.nio.file.{Files, Path}
+
     import java.io.File
+    import java.nio.file.{Files, Path}
 
     // Load jOOQ configuration XML (absolute path from DAO project)
     val jooqXmlPath: Path =
@@ -92,7 +93,7 @@ jooqGenerate := {
     log.info("JOOQ code generation completed successfully")
 
     // Return the generated files
-    val generatedDir = baseDirectory.value / "src" / "main" / "scala" / "edu" / "uci" / "ics" / "texera" / "dao" / "jooq" / "generated"
+    val generatedDir = baseDirectory.value / "src" / "main" / "scala" / "org" / "apache" / "texera" / "dao" / "jooq" / "generated"
     if (generatedDir.exists()) {
       (generatedDir ** "*.java").get ++ (generatedDir ** "*.scala").get
     } else {
diff --git a/core/dao/src/main/resources/jooq-conf.xml b/common/dao/src/main/resources/jooq-conf.xml
similarity index 95%
rename from core/dao/src/main/resources/jooq-conf.xml
rename to common/dao/src/main/resources/jooq-conf.xml
index f5f21df7714..3ab73fe497b 100644
--- a/core/dao/src/main/resources/jooq-conf.xml
+++ b/common/dao/src/main/resources/jooq-conf.xml
@@ -61,10 +61,10 @@
 
         <target>
             <!-- The destination package of your generated classes (within the destination directory) -->
-            <packageName>edu.uci.ics.texera.dao.jooq.generated</packageName>
+            <packageName>org.apache.texera.dao.jooq.generated</packageName>
 
             <!-- The destination directory of your generated classes. Using Maven directory layout here -->
-            <directory>dao/src/main/scala</directory>
+            <directory>common/dao/src/main/scala</directory>
         </target>
     </generator>
 </configuration>
diff --git a/core/dao/src/main/scala/edu/uci/ics/texera/dao/JooqCodeGenerator.scala b/common/dao/src/main/scala/org/apache/texera/dao/JooqCodeGenerator.scala
similarity index 85%
rename from core/dao/src/main/scala/edu/uci/ics/texera/dao/JooqCodeGenerator.scala
rename to common/dao/src/main/scala/org/apache/texera/dao/JooqCodeGenerator.scala
index bd7010ce0ec..f3aff9f3f00 100644
--- a/core/dao/src/main/scala/edu/uci/ics/texera/dao/JooqCodeGenerator.scala
+++ b/common/dao/src/main/scala/org/apache/texera/dao/JooqCodeGenerator.scala
@@ -17,26 +17,34 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.dao
+package org.apache.texera.dao
 
 import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions}
 import org.jooq.codegen.GenerationTool
 import org.jooq.meta.jaxb.{Configuration, Jdbc}
 
-import java.nio.file.{Files, Path}
 import java.io.File
+import java.nio.file.{Files, Path}
 
 object JooqCodeGenerator {
   @throws[Exception]
   def main(args: Array[String]): Unit = {
     // Load jOOQ configuration XML
-    val jooqXmlPath: Path =
-      Path.of("dao").resolve("src").resolve("main").resolve("resources").resolve("jooq-conf.xml")
+    val jooqXmlPath: Path = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("common")
+      .resolve("dao")
+      .resolve("src")
+      .resolve("main")
+      .resolve("resources")
+      .resolve("jooq-conf.xml")
     val jooqConfig: Configuration = GenerationTool.load(Files.newInputStream(jooqXmlPath))
 
     // Load storage.conf from the specified path
     val storageConfPath: Path = Path
-      .of("config")
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("common")
+      .resolve("config")
       .resolve("src")
       .resolve("main")
       .resolve("resources")
diff --git a/core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala b/common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
similarity index 96%
rename from core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala
rename to common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
index 18eb92b9f34..2864aa30905 100644
--- a/core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala
+++ b/common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.dao
+package org.apache.texera.dao
 
 import org.jooq.impl.DSL
 import org.jooq.{DSLContext, SQLDialect}
@@ -62,6 +62,10 @@ object SqlServer {
     instance.get
   }
 
+  def clearInstance(): Unit = {
+    instance = None
+  }
+
   /**
     * A utility function for create a transaction block using given sql context
     * @param dsl the sql context
diff --git a/core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala b/common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
similarity index 93%
rename from core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala
rename to common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
index 1bb49518163..e13ff696cfa 100644
--- a/core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala
+++ b/common/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.dao
+package org.apache.texera.dao
 
 import io.zonky.test.db.postgres.embedded.EmbeddedPostgres
-import org.jooq.{DSLContext, SQLDialect}
 import org.jooq.impl.DSL
+import org.jooq.{DSLContext, SQLDialect}
 
 import java.nio.file.Paths
 import java.sql.{Connection, DriverManager}
@@ -67,6 +67,7 @@ trait MockTexeraDB {
         value.close()
         dbInstance = None
         dslContext = None
+        SqlServer.clearInstance()
       case None =>
       // do nothing
     }
@@ -83,7 +84,7 @@ trait MockTexeraDB {
     dbInstance = Some(embedded)
 
     val ddlPath = {
-      Paths.get("./scripts/sql/texera_ddl.sql").toRealPath()
+      Paths.get("sql/texera_ddl.sql").toRealPath()
     }
     val source = Source.fromFile(ddlPath.toString)
     val content =
@@ -92,12 +93,15 @@ trait MockTexeraDB {
       } finally {
         source.close()
       }
-    val parts: Array[String] = content.split("(?m)^\\\\c texera_db")
+    val parts: Array[String] = content.split("(?m)^CREATE DATABASE :\"DB_NAME\";")
     def removeCCommands(sql: String): String =
       sql.linesIterator
         .filterNot(_.trim.startsWith("\\c"))
         .mkString("\n")
-    executeScriptInJDBC(embedded.getPostgresDatabase.getConnection, removeCCommands(parts(0)))
+    val createDBStatement =
+      """DROP DATABASE IF EXISTS texera_db;
+        |CREATE DATABASE texera_db;""".stripMargin
+    executeScriptInJDBC(embedded.getPostgresDatabase.getConnection, createDBStatement)
     val texeraDB = embedded.getDatabase(username, database)
     var tablesAndIndexCreation = removeCCommands(parts(1))
 
diff --git a/core/workflow-core/build.sbt b/common/workflow-core/build.sbt
similarity index 83%
rename from core/workflow-core/build.sbt
rename to common/workflow-core/build.sbt
index 64630b26b92..99870f03eb4 100644
--- a/core/workflow-core/build.sbt
+++ b/common/workflow-core/build.sbt
@@ -20,7 +20,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 name := "workflow-core"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
@@ -83,11 +83,15 @@ Test / PB.protoSources += PB.externalSourcePath.value
 // Test-related Dependencies
 /////////////////////////////////////////////////////////////////////////////
 
+val testcontainersVersion = "0.43.0"
+
 libraryDependencies ++= Seq(
   "org.scalamock" %% "scalamock" % "5.2.0" % Test,                  // ScalaMock
   "org.scalatest" %% "scalatest" % "3.2.15" % Test,                 // ScalaTest
   "junit" % "junit" % "4.13.2" % Test,                              // JUnit
-  "com.novocode" % "junit-interface" % "0.11" % Test                // SBT interface for JUnit
+  "com.novocode" % "junit-interface" % "0.11" % Test,               // SBT interface for JUnit
+  "com.dimafeng" %% "testcontainers-scala-scalatest" % testcontainersVersion % Test,   // Testcontainers ScalaTest integration
+  "com.dimafeng" %% "testcontainers-scala-minio" % testcontainersVersion % Test        // MinIO Testcontainer Scala integration
 )
 
 
@@ -97,6 +101,7 @@ libraryDependencies ++= Seq(
 
 val jacksonVersion = "2.15.1"
 libraryDependencies ++= Seq(
+  "javax.validation" % "validation-api" % "2.0.1.Final",
   "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,        // Jackson Databind
   "com.fasterxml.jackson.module" % "jackson-module-kotlin" % jacksonVersion % Test,   // Jackson Kotlin Module
   "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion % Test, // Jackson JDK8 Datatypes
@@ -110,6 +115,7 @@ libraryDependencies ++= Seq(
 /////////////////////////////////////////////////////////////////////////////
 // Arrow related
 val arrowVersion = "14.0.1"
+val nettyVersion = "4.1.96.Final"
 val arrowDependencies = Seq(
   // https://mvnrepository.com/artifact/org.apache.arrow/flight-grpc
   "org.apache.arrow" % "flight-grpc" % arrowVersion,
@@ -119,6 +125,22 @@ val arrowDependencies = Seq(
 
 libraryDependencies ++= arrowDependencies
 
+// Netty dependency overrides to ensure compatibility with Arrow
+// Arrow 14.0.1 requires Netty 4.1.96.Final for proper memory allocation
+// The chunkSize field issue occurs when Netty versions are mismatched
+dependencyOverrides ++= Seq(
+  "io.netty" % "netty-all" % nettyVersion,
+  "io.netty" % "netty-buffer" % nettyVersion,
+  "io.netty" % "netty-codec" % nettyVersion,
+  "io.netty" % "netty-codec-http" % nettyVersion,
+  "io.netty" % "netty-codec-http2" % nettyVersion,
+  "io.netty" % "netty-common" % nettyVersion,
+  "io.netty" % "netty-handler" % nettyVersion,
+  "io.netty" % "netty-resolver" % nettyVersion,
+  "io.netty" % "netty-transport" % nettyVersion,
+  "io.netty" % "netty-transport-native-unix-common" % nettyVersion
+)
+
 /////////////////////////////////////////////////////////////////////////////
 // Iceberg-related Dependencies
 /////////////////////////////////////////////////////////////////////////////
@@ -182,5 +204,10 @@ libraryDependencies ++= Seq(
   "org.apache.commons" % "commons-vfs2" % "2.9.0",                     // for FileResolver throw VFS-related exceptions
   "io.lakefs" % "sdk" % "1.51.0",                                     // for lakeFS api calls
   "com.typesafe" % "config" % "1.4.3",                                 // config reader
-  "org.apache.commons" % "commons-jcs3-core" % "3.2"                  // Apache Commons JCS
+  "org.apache.commons" % "commons-jcs3-core" % "3.2",                 // Apache Commons JCS
+  "software.amazon.awssdk" % "s3" % "2.29.51" excludeAll(
+    ExclusionRule(organization = "io.netty")
+  ),
+  "software.amazon.awssdk" % "auth" % "2.29.51",
+  "software.amazon.awssdk" % "regions" % "2.29.51",
 )
\ No newline at end of file
diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/executor.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/executor.proto
similarity index 93%
rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/executor.proto
rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/executor.proto
index 2bfc26cb2c7..20504c8c1c4 100644
--- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/executor.proto
+++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/executor.proto
@@ -16,10 +16,10 @@
 // under the License.
 
 syntax = "proto3";
-package edu.uci.ics.amber.core;
+package org.apache.texera.amber.core;
 
 
-import "edu/uci/ics/amber/core/virtualidentity.proto";
+import "org/apache/texera/amber/core/virtualidentity.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/virtualidentity.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/virtualidentity.proto
similarity index 97%
rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/virtualidentity.proto
rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/virtualidentity.proto
index 8302b8a16bd..3103606a4ac 100644
--- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/virtualidentity.proto
+++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/virtualidentity.proto
@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.core;
+package org.apache.texera.amber.core;
 
 import "scalapb/scalapb.proto";
 
diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflow.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflow.proto
similarity index 95%
rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflow.proto
rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflow.proto
index fe740fb2a04..984536fca72 100644
--- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflow.proto
+++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflow.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.core;
+package org.apache.texera.amber.core;
 
-import "edu/uci/ics/amber/core/virtualidentity.proto";
+import "org/apache/texera/amber/core/virtualidentity.proto";
 import "scalapb/scalapb.proto";
 
 option (scalapb.options) = {
diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflowruntimestate.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflowruntimestate.proto
similarity index 97%
rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflowruntimestate.proto
rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflowruntimestate.proto
index 60681bf8bfa..6c6105de847 100644
--- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflowruntimestate.proto
+++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflowruntimestate.proto
@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 
-package edu.uci.ics.amber.core;
+package org.apache.texera.amber.core;
 
 import "google/protobuf/timestamp.proto";
 import "scalapb/scalapb.proto";
diff --git a/core/workflow-core/src/main/protobuf/scalapb/scalapb.proto b/common/workflow-core/src/main/protobuf/scalapb/scalapb.proto
similarity index 100%
rename from core/workflow-core/src/main/protobuf/scalapb/scalapb.proto
rename to common/workflow-core/src/main/protobuf/scalapb/scalapb.proto
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/WorkflowRuntimeException.scala
similarity index 93%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/WorkflowRuntimeException.scala
index 77c4b8b9d23..80d5cce0e17 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/WorkflowRuntimeException.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core
+package org.apache.texera.amber.core
 
-import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity
+import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
 
 class WorkflowRuntimeException(
     val message: String,
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/ExecFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/ExecFactory.scala
similarity index 97%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/ExecFactory.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/ExecFactory.scala
index 172cc0e68b8..88deaf7bebf 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/ExecFactory.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/ExecFactory.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.executor
+package org.apache.texera.amber.core.executor
 
 object ExecFactory {
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/JavaRuntimeCompilation.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/JavaRuntimeCompilation.scala
similarity index 97%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/JavaRuntimeCompilation.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/JavaRuntimeCompilation.scala
index a72270a8f00..eb50c273f9f 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/JavaRuntimeCompilation.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/JavaRuntimeCompilation.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.executor
+package org.apache.texera.amber.core.executor
 
 import java.io.ByteArrayOutputStream
 import java.net.URI
@@ -28,7 +28,7 @@ object JavaRuntimeCompilation {
   val compiler: JavaCompiler = ToolProvider.getSystemJavaCompiler
 
   def compileCode(code: String): Class[_] = {
-    val packageName = "edu.uci.ics.amber.operators.udf.java"
+    val packageName = "org.apache.texera.amber.operators.udf.java"
 
     //to hide it from user we will append the package in the udf code.
     val codeToCompile = s"package $packageName;\n$code"
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/OperatorExecutor.scala
similarity index 88%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/OperatorExecutor.scala
index a3ef8ea917c..f99739acc04 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/OperatorExecutor.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.executor
+package org.apache.texera.amber.core.executor
 
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 trait OperatorExecutor {
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/SourceOperatorExecutor.scala
similarity index 90%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/SourceOperatorExecutor.scala
index 478c1c36fbc..633314679a4 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/SourceOperatorExecutor.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.executor
+package org.apache.texera.amber.core.executor
 
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 trait SourceOperatorExecutor extends OperatorExecutor {
   override def open(): Unit = {}
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/state/State.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/state/State.scala
similarity index 93%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/state/State.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/state/State.scala
index 1e6b16d5a56..3226c9d2fe7 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/state/State.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/state/State.scala
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.state
+package org.apache.texera.amber.core.state
+
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
 import scala.collection.mutable
 
 final case class State(tuple: Option[Tuple] = None, passToAllDownstream: Boolean = false) {
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/DocumentFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala
similarity index 86%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/DocumentFactory.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala
index d2817b86e09..4c37c33bb20 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/DocumentFactory.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage
-
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.core.storage.FileResolver.DATASET_FILE_URI_SCHEME
-import edu.uci.ics.amber.core.storage.model._
-import edu.uci.ics.amber.core.storage.VFSResourceType._
-import edu.uci.ics.amber.core.storage.VFSURIFactory.{VFS_FILE_URI_SCHEME, decodeURI}
-import edu.uci.ics.amber.core.storage.result.iceberg.IcebergDocument
-import edu.uci.ics.amber.core.tuple.{Schema, Tuple}
-import edu.uci.ics.amber.util.IcebergUtil
+package org.apache.texera.amber.core.storage
+
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.core.storage.FileResolver.DATASET_FILE_URI_SCHEME
+import org.apache.texera.amber.core.storage.VFSResourceType._
+import org.apache.texera.amber.core.storage.VFSURIFactory.{VFS_FILE_URI_SCHEME, decodeURI}
+import org.apache.texera.amber.core.storage.model._
+import org.apache.texera.amber.core.storage.result.iceberg.IcebergDocument
+import org.apache.texera.amber.core.tuple.{Schema, Tuple}
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.iceberg.data.Record
 import org.apache.iceberg.{Schema => IcebergSchema}
 
@@ -87,8 +87,8 @@ object DocumentFactory {
               overrideIfExists = true
             )
             val serde: (IcebergSchema, Tuple) => Record = IcebergUtil.toGenericRecord
-            val deserde: (IcebergSchema, Record) => Tuple = (_, record) =>
-              IcebergUtil.fromRecord(record, schema)
+            val deserde: (IcebergSchema, Record) => Tuple = (schema, record) =>
+              IcebergUtil.fromRecord(record, IcebergUtil.fromIcebergSchema(schema))
 
             new IcebergDocument[Tuple](
               namespace,
@@ -144,8 +144,8 @@ object DocumentFactory {
 
             val amberSchema = IcebergUtil.fromIcebergSchema(table.schema())
             val serde: (IcebergSchema, Tuple) => Record = IcebergUtil.toGenericRecord
-            val deserde: (IcebergSchema, Record) => Tuple = (_, record) =>
-              IcebergUtil.fromRecord(record, amberSchema)
+            val deserde: (IcebergSchema, Record) => Tuple = (schema, record) =>
+              IcebergUtil.fromRecord(record, IcebergUtil.fromIcebergSchema(schema))
 
             (
               new IcebergDocument[Tuple](
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/FileResolver.scala
similarity index 75%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/FileResolver.scala
index 6bf138b4c0a..cda5b28779b 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/FileResolver.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage
-
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.dao.jooq.generated.tables.Dataset.DATASET
-import edu.uci.ics.texera.dao.jooq.generated.tables.DatasetVersion.DATASET_VERSION
-import edu.uci.ics.texera.dao.jooq.generated.tables.User.USER
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Dataset, DatasetVersion}
+package org.apache.texera.amber.core.storage
+
 import org.apache.commons.vfs2.FileNotFoundException
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.tables.Dataset.DATASET
+import org.apache.texera.dao.jooq.generated.tables.DatasetVersion.DATASET_VERSION
+import org.apache.texera.dao.jooq.generated.tables.User.USER
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Dataset, DatasetVersion}
 
 import java.net.{URI, URLEncoder}
 import java.nio.charset.StandardCharsets
@@ -75,6 +75,31 @@ object FileResolver {
     filePath.toUri
   }
 
+  /**
+    * Parses a dataset file path and extracts its components.
+    * Expected format: /ownerEmail/datasetName/versionName/fileRelativePath
+    *
+    * @param fileName The file path to parse
+    * @return Some((ownerEmail, datasetName, versionName, fileRelativePath)) if valid, None otherwise
+    */
+  private def parseDatasetFilePath(
+      fileName: String
+  ): Option[(String, String, String, Array[String])] = {
+    val filePath = Paths.get(fileName)
+    val pathSegments = (0 until filePath.getNameCount).map(filePath.getName(_).toString).toArray
+
+    if (pathSegments.length < 4) {
+      return None
+    }
+
+    val ownerEmail = pathSegments(0)
+    val datasetName = pathSegments(1)
+    val versionName = pathSegments(2)
+    val fileRelativePathSegments = pathSegments.drop(3)
+
+    Some((ownerEmail, datasetName, versionName, fileRelativePathSegments))
+  }
+
   /**
     * Attempts to resolve a given fileName to a URI.
     *
@@ -88,14 +113,13 @@ object FileResolver {
     * @throws FileNotFoundException if the dataset file does not exist or cannot be created
     */
   private def datasetResolveFunc(fileName: String): URI = {
-    val filePath = Paths.get(fileName)
-    val pathSegments = (0 until filePath.getNameCount).map(filePath.getName(_).toString).toArray
+    val (ownerEmail, datasetName, versionName, fileRelativePathSegments) =
+      parseDatasetFilePath(fileName).getOrElse(
+        throw new FileNotFoundException(s"Dataset file $fileName not found.")
+      )
 
-    // extract info from the user-given fileName
-    val ownerEmail = pathSegments(0)
-    val datasetName = pathSegments(1)
-    val versionName = pathSegments(2)
-    val fileRelativePath = Paths.get(pathSegments.drop(3).head, pathSegments.drop(3).tail: _*)
+    val fileRelativePath =
+      Paths.get(fileRelativePathSegments.head, fileRelativePathSegments.tail: _*)
 
     // fetch the dataset and version from DB to get dataset ID and version hash
     val (dataset, datasetVersion) =
@@ -168,4 +192,20 @@ object FileResolver {
       case _: Exception => false // Invalid URI format
     }
   }
+
+  /**
+    * Parses a dataset file path to extract owner email and dataset name.
+    * Expected format: /ownerEmail/datasetName/versionName/fileRelativePath
+    *
+    * @param path The file path from operator properties
+    * @return Some((ownerEmail, datasetName)) if path is valid, None otherwise
+    */
+  def parseDatasetOwnerAndName(path: String): Option[(String, String)] = {
+    if (path == null) {
+      return None
+    }
+    parseDatasetFilePath(path).map {
+      case (ownerEmail, datasetName, _, _) => (ownerEmail, datasetName)
+    }
+  }
 }
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/IcebergCatalogInstance.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala
similarity index 94%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/IcebergCatalogInstance.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala
index 06c438469a4..e3512874c9b 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/IcebergCatalogInstance.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage
+package org.apache.texera.amber.core.storage
 
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.util.IcebergUtil
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.iceberg.catalog.Catalog
 
 /**
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/VFSURIFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/VFSURIFactory.scala
similarity index 94%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/VFSURIFactory.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/VFSURIFactory.scala
index 4174ca8cd57..3513ac5ecd8 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/VFSURIFactory.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/VFSURIFactory.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage
+package org.apache.texera.amber.core.storage
 
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   OperatorIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow.GlobalPortIdentity
-import edu.uci.ics.amber.util.serde.GlobalPortIdentitySerde
-import edu.uci.ics.amber.util.serde.GlobalPortIdentitySerde.SerdeOps
+import org.apache.texera.amber.core.workflow.GlobalPortIdentity
+import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde
+import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde.SerdeOps
 
 import java.net.URI
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/BufferedItemWriter.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/BufferedItemWriter.scala
similarity index 97%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/BufferedItemWriter.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/BufferedItemWriter.scala
index d895060a2b0..cfcd19fb9be 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/BufferedItemWriter.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/BufferedItemWriter.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 /**
   * BufferedItemWriter provides an interface for writing items to a buffer and performing I/O operations.
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/DatasetFileDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala
similarity index 89%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/DatasetFileDocument.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala
index 872a6f59222..b62b6583658 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/DatasetFileDocument.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala
@@ -17,20 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.EnvironmentalVariable
-import edu.uci.ics.amber.core.storage.model.DatasetFileDocument.{
+import org.apache.texera.amber.config.EnvironmentalVariable
+import org.apache.texera.amber.core.storage.model.DatasetFileDocument.{
   fileServiceGetPresignURLEndpoint,
   userJwtToken
 }
-import edu.uci.ics.amber.core.storage.util.LakeFSStorageClient
-import edu.uci.ics.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage
-import edu.uci.ics.amber.util.PathUtils
+import org.apache.texera.amber.core.storage.util.LakeFSStorageClient
+import org.apache.texera.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage
 
 import java.io.{File, FileOutputStream, InputStream}
-import java.net.{HttpURLConnection, URI, URL, URLDecoder, URLEncoder}
+import java.net._
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path, Paths}
 import scala.jdk.CollectionConverters.IteratorHasAsScala
@@ -169,10 +168,21 @@ private[storage] class DatasetFileDocument(uri: URI)
       case Some(file) => Files.delete(file.toPath)
       case None       => // Do nothing
     }
+    lazy val datasetsRootPath =
+      Path
+        .of(sys.env.getOrElse("TEXERA_HOME", "."))
+        .resolve("amber")
+        .resolve("user-resources")
+        .resolve("datasets")
+
+    def getDatasetPath(did: Integer): Path = {
+      datasetsRootPath.resolve(did.toString)
+    }
+
     // then remove the dataset file
     GitVersionControlLocalFileStorage.removeFileFromRepo(
-      PathUtils.getDatasetPath(0),
-      PathUtils.getDatasetPath(0).resolve(fileRelativePath)
+      getDatasetPath(0),
+      getDatasetPath(0).resolve(fileRelativePath)
     )
   }
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/OnDataset.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/OnDataset.scala
similarity index 94%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/OnDataset.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/OnDataset.scala
index 79d96e3936a..6c19ee1002b 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/OnDataset.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/OnDataset.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 trait OnDataset {
   def getRepositoryName(): String
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/ReadonlyLocalFileDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyLocalFileDocument.scala
similarity index 92%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/ReadonlyLocalFileDocument.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyLocalFileDocument.scala
index 9a206b46b30..14c9d1688e5 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/ReadonlyLocalFileDocument.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyLocalFileDocument.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 import java.io.{File, FileInputStream, InputStream}
 import java.net.URI
@@ -54,7 +54,11 @@ private[storage] class ReadonlyLocalFileDocument(uri: URI)
   override def get(): Iterator[Nothing] =
     throw new NotImplementedError("get is not supported for ReadonlyLocalFileDocument")
 
-  override def getRange(from: Int, until: Int): Iterator[Nothing] =
+  override def getRange(
+      from: Int,
+      until: Int,
+      columns: Option[Seq[String]] = None
+  ): Iterator[Nothing] =
     throw new NotImplementedError("getRange is not supported for ReadonlyLocalFileDocument")
 
   override def getAfter(offset: Int): Iterator[Nothing] =
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/ReadonlyVirtualDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyVirtualDocument.scala
similarity index 90%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/ReadonlyVirtualDocument.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyVirtualDocument.scala
index 99f682c46bc..47a55112842 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/ReadonlyVirtualDocument.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyVirtualDocument.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 import java.io.{File, InputStream}
 import java.net.URI
@@ -52,9 +52,10 @@ trait ReadonlyVirtualDocument[T] {
     * Get an iterator of a sequence starting from index `from`, until index `until`.
     * @param from the starting index (inclusive)
     * @param until the ending index (exclusive)
+    * @param columns optional sequence of column names to retrieve. If None, retrieves all columns.
     * @return an iterator that returns data items of type T
     */
-  def getRange(from: Int, until: Int): Iterator[T]
+  def getRange(from: Int, until: Int, columns: Option[Seq[String]] = None): Iterator[T]
 
   /**
     * Get an iterator of all items after the specified index `offset`.
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/VirtualCollection.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualCollection.scala
similarity index 96%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/VirtualCollection.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualCollection.scala
index 15c207907d4..c5d6b107e77 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/VirtualCollection.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualCollection.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 import java.net.URI
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/VirtualDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualDocument.scala
similarity index 96%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/VirtualDocument.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualDocument.scala
index 259a3568f31..8e72c52a803 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/model/VirtualDocument.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualDocument.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 import java.io.{File, InputStream}
 import java.net.URI
@@ -55,9 +55,10 @@ abstract class VirtualDocument[T] extends ReadonlyVirtualDocument[T] {
     * get an iterator of a sequence starting from index `from`, until index `until`
     * @param from the starting index (inclusive)
     * @param until the ending index (exclusive)
+    * @param columns the columns to be projected
     * @return an iterator that returns data items of type T
     */
-  def getRange(from: Int, until: Int): Iterator[T] =
+  def getRange(from: Int, until: Int, columns: Option[Seq[String]] = None): Iterator[T] =
     throw new NotImplementedError("getRange method is not implemented")
 
   /**
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultSchema.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/ResultSchema.scala
similarity index 92%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultSchema.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/ResultSchema.scala
index aca3781f6d4..ade33283f7f 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultSchema.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/ResultSchema.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.result
+package org.apache.texera.amber.core.storage.result
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
 
 object ResultSchema {
   val runtimeStatisticsSchema: Schema = new Schema(
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/WorkflowResultStore.scala
similarity index 89%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/WorkflowResultStore.scala
index 859225d4533..c0d7d0edf8c 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/WorkflowResultStore.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.result
+package org.apache.texera.amber.core.storage.result
 
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
 
 case class OperatorResultMetadata(tupleCount: Int = 0, changeDetector: String = "")
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/IcebergDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergDocument.scala
similarity index 94%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/IcebergDocument.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergDocument.scala
index 484a46d6e16..e238ab7417a 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/IcebergDocument.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergDocument.scala
@@ -17,28 +17,28 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.result.iceberg
+package org.apache.texera.amber.core.storage.result.iceberg
 
-import edu.uci.ics.amber.core.storage.IcebergCatalogInstance
-import edu.uci.ics.amber.core.storage.model.{BufferedItemWriter, VirtualDocument}
-import edu.uci.ics.amber.core.storage.util.StorageUtil.{withLock, withReadLock, withWriteLock}
-import edu.uci.ics.amber.util.IcebergUtil
+import org.apache.texera.amber.core.storage.IcebergCatalogInstance
+import org.apache.texera.amber.core.storage.model.{BufferedItemWriter, VirtualDocument}
+import org.apache.texera.amber.core.storage.util.StorageUtil.{withLock, withReadLock, withWriteLock}
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.commons.io.IOUtils
-import org.apache.iceberg.{FileScanTask, Table}
 import org.apache.iceberg.catalog.{Catalog, TableIdentifier}
 import org.apache.iceberg.data.Record
 import org.apache.iceberg.exceptions.NoSuchTableException
 import org.apache.iceberg.types.{Conversions, Types}
+import org.apache.iceberg.{FileScanTask, Table}
 
 import java.io.{ByteArrayInputStream, InputStream, PipedInputStream, PipedOutputStream}
 import java.net.URI
-import java.util.concurrent.locks.{ReentrantLock, ReentrantReadWriteLock}
-import scala.jdk.CollectionConverters._
 import java.nio.ByteBuffer
-import java.time.{Instant, LocalDate, ZoneOffset}
 import java.time.format.DateTimeFormatter
+import java.time.{Instant, LocalDate, ZoneOffset}
+import java.util.concurrent.locks.{ReentrantLock, ReentrantReadWriteLock}
 import java.util.zip.{ZipEntry, ZipOutputStream}
 import scala.collection.mutable
+import scala.jdk.CollectionConverters._
 import scala.util.Using
 
 object Constants {
@@ -105,8 +105,8 @@ private[storage] class IcebergDocument[T >: Null <: AnyRef](
   /**
     * Get records within a specified range [from, until).
     */
-  override def getRange(from: Int, until: Int): Iterator[T] = {
-    getUsingFileSequenceOrder(from, Some(until))
+  override def getRange(from: Int, until: Int, columns: Option[Seq[String]] = None): Iterator[T] = {
+    getUsingFileSequenceOrder(from, Some(until), columns)
   }
 
   /**
@@ -150,8 +150,13 @@ private[storage] class IcebergDocument[T >: Null <: AnyRef](
     *
     * @param from  start from which record inclusively, if 0 means start from the first
     * @param until end at which record exclusively, if None means read to the table's EOF
+    * @param columns columns to be projected
     */
-  private def getUsingFileSequenceOrder(from: Int, until: Option[Int]): Iterator[T] =
+  private def getUsingFileSequenceOrder(
+      from: Int,
+      until: Option[Int],
+      columns: Option[Seq[String]] = None
+  ): Iterator[T] =
     withReadLock(lock) {
       new Iterator[T] {
         private val iteLock = new ReentrantLock()
@@ -259,9 +264,13 @@ private[storage] class IcebergDocument[T >: Null <: AnyRef](
 
           while (!currentRecordIterator.hasNext && usableFileIterator.hasNext) {
             val nextFile = usableFileIterator.next()
+            val schemaToUse = columns match {
+              case Some(cols) => tableSchema.select(cols.asJava)
+              case None       => tableSchema
+            }
             currentRecordIterator = IcebergUtil.readDataFileAsIterator(
               nextFile.file(),
-              tableSchema,
+              schemaToUse,
               table.get
             )
 
@@ -281,7 +290,11 @@ private[storage] class IcebergDocument[T >: Null <: AnyRef](
 
           val record = currentRecordIterator.next()
           numOfReturnedRecords += 1
-          deserde(tableSchema, record)
+          val schemaToUse = columns match {
+            case Some(cols) => tableSchema.select(cols.asJava)
+            case None       => tableSchema
+          }
+          deserde(schemaToUse, record)
         }
       }
     }
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/IcebergTableWriter.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala
similarity index 95%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/IcebergTableWriter.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala
index 60b2b1a1a94..549cb4b9d17 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/IcebergTableWriter.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.result.iceberg
+package org.apache.texera.amber.core.storage.result.iceberg
 
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.core.storage.model.BufferedItemWriter
-import edu.uci.ics.amber.util.IcebergUtil
-import org.apache.iceberg.{Schema, Table}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.core.storage.model.BufferedItemWriter
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.iceberg.catalog.Catalog
 import org.apache.iceberg.data.Record
 import org.apache.iceberg.data.parquet.GenericParquetWriter
 import org.apache.iceberg.io.{DataWriter, OutputFile}
 import org.apache.iceberg.parquet.Parquet
+import org.apache.iceberg.{Schema, Table}
 
 import java.nio.file.Paths
 import scala.collection.mutable.ArrayBuffer
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/OnIceberg.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/OnIceberg.scala
similarity index 94%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/OnIceberg.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/OnIceberg.scala
index e6771631210..2c00a1b0929 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/iceberg/OnIceberg.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/OnIceberg.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.result.iceberg
+package org.apache.texera.amber.core.storage.result.iceberg
 
-import edu.uci.ics.amber.util.IcebergUtil
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.iceberg.exceptions.NoSuchTableException
 
 trait OnIceberg {
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/LakeFSStorageClient.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala
similarity index 88%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/LakeFSStorageClient.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala
index 65a300eb3cc..d01e820259d 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/LakeFSStorageClient.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala
@@ -17,16 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.util
+package org.apache.texera.amber.core.storage.util
 
-import edu.uci.ics.amber.config.StorageConfig
 import io.lakefs.clients.sdk._
+import io.lakefs.clients.sdk.model.ResetCreation.TypeEnum
 import io.lakefs.clients.sdk.model._
+import org.apache.texera.amber.config.StorageConfig
 
 import java.io.{File, FileOutputStream, InputStream}
+import java.net.URI
 import java.nio.file.Files
 import scala.jdk.CollectionConverters._
-import io.lakefs.clients.sdk.model.ResetCreation.TypeEnum
 
 /**
   * LakeFSFileStorage provides high-level file storage operations using LakeFS,
@@ -358,4 +359,47 @@ object LakeFSStorageClient {
 
     branchesApi.resetBranch(repoName, branchName, resetCreation).execute()
   }
+
+  /**
+    * Parse a physical address URI of the form "<scheme>://<bucket>/<key...>" into (bucket, key).
+    *
+    * Expected examples:
+    *   - "s3://my-bucket/path/to/file.csv"
+    *   - "gs://my-bucket/some/prefix/data.json"
+    *
+    * @param address URI string in the form "<scheme>://<bucket>/<key...>"
+    * @return (bucket, key) where key does not start with "/"
+    * @throws IllegalArgumentException
+    *   if the address is empty, not a valid URI, missing bucket/host, or missing key/path
+    */
+  def parsePhysicalAddress(address: String): (String, String) = {
+    val raw = Option(address).getOrElse("").trim
+    if (raw.isEmpty)
+      throw new IllegalArgumentException("Address is empty (expected '<scheme>://<bucket>/<key>')")
+
+    val uri =
+      try new URI(raw)
+      catch {
+        case e: Exception =>
+          throw new IllegalArgumentException(
+            s"Invalid address URI: '$raw' (expected '<scheme>://<bucket>/<key>')",
+            e
+          )
+      }
+
+    val bucket = Option(uri.getHost).getOrElse("").trim
+    if (bucket.isEmpty)
+      throw new IllegalArgumentException(
+        s"Invalid address: missing host/bucket in '$raw' (expected '<scheme>://<bucket>/<key>')"
+      )
+
+    val key = Option(uri.getPath).getOrElse("").stripPrefix("/").trim
+    if (key.isEmpty)
+      throw new IllegalArgumentException(
+        s"Invalid address: missing key/path in '$raw' (expected '<scheme>://<bucket>/<key>')"
+      )
+
+    (bucket, key)
+  }
+
 }
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/StorageUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/StorageUtil.scala
similarity index 96%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/StorageUtil.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/StorageUtil.scala
index 0cfe71f348c..fb75794c372 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/StorageUtil.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/StorageUtil.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.util
+package org.apache.texera.amber.core.storage.util
 
 import java.util.concurrent.locks.{Lock, ReadWriteLock}
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java
similarity index 99%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java
index 9f37adfbf9a..72566dd2d70 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.util.dataset;
+package org.apache.texera.amber.core.storage.util.dataset;
 
 import org.eclipse.jgit.api.errors.GitAPIException;
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/JGitVersionControl.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/JGitVersionControl.java
similarity index 99%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/JGitVersionControl.java
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/JGitVersionControl.java
index 52f853d6505..4b438ae537c 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/JGitVersionControl.java
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/JGitVersionControl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.util.dataset;
+package org.apache.texera.amber.core.storage.util.dataset;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ResetCommand;
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/PhysicalFileNode.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/PhysicalFileNode.java
similarity index 95%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/PhysicalFileNode.java
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/PhysicalFileNode.java
index 189a6a6dc39..07510335c1e 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/dataset/PhysicalFileNode.java
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/PhysicalFileNode.java
@@ -17,15 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.util.dataset;
+package org.apache.texera.amber.core.storage.util.dataset;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 public class PhysicalFileNode {
   private final Path absoluteFilePath;
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Attribute.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Attribute.java
similarity index 95%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Attribute.java
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Attribute.java
index 92d91f7ba0d..84d52fddced 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Attribute.java
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Attribute.java
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple;
+package org.apache.texera.amber.core.tuple;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.io.Serializable;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -47,7 +48,7 @@ public Attribute(
     }
 
     @JsonProperty(value = "attributeName", required = true)
-    @NotNull(message = "Attribute name is required")
+    @NotBlank(message = "Attribute name is required")
     public String getName() {
         return attributeName;
     }
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/AttributeType.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeType.java
similarity index 77%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/AttributeType.java
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeType.java
index 8ec612b5c91..61abd741e87 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/AttributeType.java
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeType.java
@@ -17,48 +17,47 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple;
+package org.apache.texera.amber.core.tuple;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.util.List;
 
 public enum AttributeType implements Serializable {
 
     /**
-     * To add a new edu.ics.uci.amber.model.tuple.model.AttributeType, update the following files to handle the new type:
+     * To add a new AttributeType, update the following files to handle the new type:
      * 1. AttributeTypeUtils
-     * <code>src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtils.scala</code>
+     * <code>src/main/scala/org/apache/texera/workflow/common/tuple/schema/AttributeTypeUtils.scala</code>
      * Provide parsing, inferring, and casting logic between other AttributeTypes.
      * <p>
      * 2. SQLSourceOpDesc
-     * <code>src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpDesc</code>
-     * Especially SQLSources will need to map the input schema to Texera.Schema. edu.ics.uci.amber.model.tuple.model.AttributeType
+     * <code>src/main/scala/org/apache/texera/workflow/operators/source/sql/SQLSourceOpDesc</code>
+     * Especially SQLSources will need to map the input schema to Texera.Schema. AttributeType
      * needs to be converted from original source types accordingly.
      * <p>
      * 3. FilterPredicate
-     * <code>src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java</code>
+     * <code>src/main/scala/org/apache/texera/workflow/operators/filter/FilterPredicate.java</code>
      * FilterPredicate takes in AttributeTypes and converts them into a comparable type, then do
      * the comparison. New AttributeTypes needs to be mapped to a comparable type there.
      * <p>
      * 4. SpecializedAverageOpDesc.getNumericalValue
-     * <code>src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/SpecializedAverageOpDesc.scala</code>
+     * <code>src/main/scala/org/apache/texera/workflow/operators/aggregate/SpecializedAverageOpDesc.scala</code>
      * New AttributeTypes might need to be converted into a numerical value in order to perform
      * aggregations.
      * <p>
      * 5. SchemaPropagationService.SchemaAttribute
      * <code>src/app/workspace/service/dynamic-schema/schema-propagation/schema-propagation.service.ts</code>
-     * Declare the frontend SchemaAttribute for the new edu.ics.uci.amber.model.tuple.model.AttributeType.
+     * Declare the frontend SchemaAttribute for the new AttributeType.
      * <p>
      * 6. ArrowUtils (Java)
-     * <code>src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala</code>
-     * Provide java-side conversion between ArrowType and edu.ics.uci.amber.model.tuple.model.AttributeType.
+     * <code>src/main/scala/org/apache/amber/engine/architecture/pythonworker/ArrowUtils.scala</code>
+     * Provide java-side conversion between ArrowType and AttributeType.
      * <p>
      * 7. ArrowUtils (Python)
      * <code>src/main/python/core/util/arrow_utils.py</code>
-     * Provide python-side conversion between ArrowType and edu.ics.uci.amber.model.tuple.model.AttributeType.
+     * Provide python-side conversion between ArrowType and AttributeType.
      */
 
 
@@ -71,6 +70,7 @@ public enum AttributeType implements Serializable {
     BOOLEAN("boolean", Boolean.class),
     TIMESTAMP("timestamp", Timestamp.class),
     BINARY("binary", byte[].class),
+    LARGE_BINARY("large_binary", LargeBinary.class),
     ANY("ANY", Object.class);
 
     private final String name;
@@ -110,6 +110,8 @@ public static AttributeType getAttributeType(Class<?> fieldClass) {
             return TIMESTAMP;
         } else if (fieldClass.equals(byte[].class)) {
             return BINARY;
+        } else if (fieldClass.equals(LargeBinary.class)) {
+            return LARGE_BINARY;
         } else {
             return ANY;
         }
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/AttributeTypeUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtils.scala
similarity index 66%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/AttributeTypeUtils.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtils.scala
index 2c660a14f50..17c3dfef33c 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/AttributeTypeUtils.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtils.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
 import com.github.sisyphsu.dateparser.DateParserUtils
 
@@ -121,14 +121,15 @@ object AttributeTypeUtils extends Serializable {
   ): Any = {
     if (field == null) return null
     attributeType match {
-      case AttributeType.INTEGER   => parseInteger(field, force)
-      case AttributeType.LONG      => parseLong(field, force)
-      case AttributeType.DOUBLE    => parseDouble(field)
-      case AttributeType.BOOLEAN   => parseBoolean(field)
-      case AttributeType.TIMESTAMP => parseTimestamp(field)
-      case AttributeType.STRING    => field.toString
-      case AttributeType.BINARY    => field
-      case AttributeType.ANY | _   => field
+      case AttributeType.INTEGER      => parseInteger(field, force)
+      case AttributeType.LONG         => parseLong(field, force)
+      case AttributeType.DOUBLE       => parseDouble(field)
+      case AttributeType.BOOLEAN      => parseBoolean(field)
+      case AttributeType.TIMESTAMP    => parseTimestamp(field)
+      case AttributeType.STRING       => field.toString
+      case AttributeType.BINARY       => field
+      case AttributeType.LARGE_BINARY => new LargeBinary(field.toString)
+      case AttributeType.ANY | _      => field
     }
   }
 
@@ -200,10 +201,15 @@ object AttributeTypeUtils extends Serializable {
   def parseTimestamp(fieldValue: Any): Timestamp = {
     val attempt: Try[Timestamp] = Try {
       fieldValue match {
-        case str: String          => new Timestamp(DateParserUtils.parseDate(str.trim).getTime)
-        case long: java.lang.Long => new Timestamp(long)
-        case timestamp: Timestamp => timestamp
-        case date: java.util.Date => new Timestamp(date.getTime)
+        case str: String                              => new Timestamp(DateParserUtils.parseDate(str.trim).getTime)
+        case long: java.lang.Long                     => new Timestamp(long)
+        case timestamp: Timestamp                     => timestamp
+        case date: java.util.Date                     => new Timestamp(date.getTime)
+        case localDateTime: java.time.LocalDateTime   => Timestamp.valueOf(localDateTime)
+        case instant: java.time.Instant               => Timestamp.from(instant)
+        case offsetDateTime: java.time.OffsetDateTime => Timestamp.from(offsetDateTime.toInstant)
+        case zonedDateTime: java.time.ZonedDateTime   => Timestamp.from(zonedDateTime.toInstant)
+        case localDate: java.time.LocalDate           => Timestamp.valueOf(localDate.atStartOfDay())
         // Integer, Double, Boolean, Binary are considered to be illegal here.
         case _ =>
           throw new AttributeTypeException(
@@ -383,10 +389,143 @@ object AttributeTypeUtils extends Serializable {
       case AttributeType.INTEGER   => tryParseInteger(fieldValue)
       case AttributeType.TIMESTAMP => tryParseTimestamp(fieldValue)
       case AttributeType.BINARY    => tryParseString()
-      case _                       => tryParseString()
+      case AttributeType.LARGE_BINARY =>
+        AttributeType.LARGE_BINARY // Large binaries are never inferred from data
+      case _ => tryParseString()
     }
   }
 
+  /** Three-way compare for the given attribute type.
+    * Returns < 0 if left < right, > 0 if left > right, 0 if equal.
+    * Null semantics: null < non-null (both null => 0).
+    */
+  @throws[UnsupportedOperationException]
+  def compare(left: Any, right: Any, attrType: AttributeType): Int =
+    (left, right) match {
+      case (null, null) => 0
+      case (null, _)    => -1
+      case (_, null)    => 1
+      case _ =>
+        attrType match {
+          case AttributeType.INTEGER =>
+            java.lang.Integer.compare(
+              left.asInstanceOf[Number].intValue(),
+              right.asInstanceOf[Number].intValue()
+            )
+          case AttributeType.LONG =>
+            java.lang.Long.compare(
+              left.asInstanceOf[Number].longValue(),
+              right.asInstanceOf[Number].longValue()
+            )
+          case AttributeType.DOUBLE =>
+            java.lang.Double.compare(
+              left.asInstanceOf[Number].doubleValue(),
+              right.asInstanceOf[Number].doubleValue()
+            ) // -Infinity < ... < -0.0 < +0.0 < ... < +Infinity < NaN
+          case AttributeType.BOOLEAN =>
+            java.lang.Boolean.compare(
+              left.asInstanceOf[Boolean],
+              right.asInstanceOf[Boolean]
+            )
+          case AttributeType.TIMESTAMP =>
+            java.lang.Long.compare(
+              left.asInstanceOf[Timestamp].getTime,
+              right.asInstanceOf[Timestamp].getTime
+            )
+          case AttributeType.STRING =>
+            left.toString.compareTo(right.toString)
+          case AttributeType.BINARY =>
+            java.util.Arrays.compareUnsigned(
+              left.asInstanceOf[Array[Byte]],
+              right.asInstanceOf[Array[Byte]]
+            )
+          case _ =>
+            throw new UnsupportedOperationException(
+              s"Unsupported attribute type for compare: $attrType"
+            )
+        }
+    }
+
+  /** Type-aware addition (null is identity). */
+  @throws[UnsupportedOperationException]
+  def add(left: Object, right: Object, attrType: AttributeType): Object =
+    (left, right) match {
+      case (null, null)  => zeroValue(attrType)
+      case (null, right) => right
+      case (left, null)  => left
+      case (left, right) =>
+        attrType match {
+          case AttributeType.INTEGER =>
+            java.lang.Integer.valueOf(
+              left.asInstanceOf[Number].intValue() + right.asInstanceOf[Number].intValue()
+            )
+          case AttributeType.LONG =>
+            java.lang.Long.valueOf(
+              left.asInstanceOf[Number].longValue() + right.asInstanceOf[Number].longValue()
+            )
+          case AttributeType.DOUBLE =>
+            java.lang.Double.valueOf(
+              left.asInstanceOf[Number].doubleValue() + right.asInstanceOf[Number].doubleValue()
+            )
+          case AttributeType.TIMESTAMP =>
+            new Timestamp(
+              left.asInstanceOf[Timestamp].getTime + right.asInstanceOf[Timestamp].getTime
+            )
+          case _ =>
+            throw new UnsupportedOperationException(
+              s"Unsupported attribute type for addition: $attrType"
+            )
+        }
+    }
+
+  /** Additive identity for supported numeric/timestamp types.
+    * For BINARY an empty array is returned as an identity value.
+    */
+  @throws[UnsupportedOperationException]
+  def zeroValue(attrType: AttributeType): Object =
+    attrType match {
+      case AttributeType.INTEGER   => java.lang.Integer.valueOf(0)
+      case AttributeType.LONG      => java.lang.Long.valueOf(0L)
+      case AttributeType.DOUBLE    => java.lang.Double.valueOf(0.0d)
+      case AttributeType.TIMESTAMP => new Timestamp(0L)
+      case AttributeType.BINARY    => Array.emptyByteArray
+      case _ =>
+        throw new UnsupportedOperationException(
+          s"Unsupported attribute type for zero value: $attrType"
+        )
+    }
+
+  /** Returns the maximum possible value for a given attribute type. */
+  @throws[UnsupportedOperationException]
+  def maxValue(attrType: AttributeType): Object =
+    attrType match {
+      case AttributeType.INTEGER   => java.lang.Integer.valueOf(Integer.MAX_VALUE)
+      case AttributeType.LONG      => java.lang.Long.valueOf(java.lang.Long.MAX_VALUE)
+      case AttributeType.DOUBLE    => java.lang.Double.valueOf(java.lang.Double.MAX_VALUE)
+      case AttributeType.TIMESTAMP => new Timestamp(java.lang.Long.MAX_VALUE)
+      case _ =>
+        throw new UnsupportedOperationException(
+          s"Unsupported attribute type for max value: $attrType"
+        )
+    }
+
+  /** Returns the minimum possible value for a given attribute type.
+    * For BINARY under lexicographic order, the empty array is the global minimum.
+    */
+  @throws[UnsupportedOperationException]
+  def minValue(attrType: AttributeType): Object =
+    attrType match {
+      case AttributeType.INTEGER   => java.lang.Integer.valueOf(Integer.MIN_VALUE)
+      case AttributeType.LONG      => java.lang.Long.valueOf(java.lang.Long.MIN_VALUE)
+      case AttributeType.DOUBLE    => java.lang.Double.valueOf(java.lang.Double.NEGATIVE_INFINITY)
+      case AttributeType.TIMESTAMP => new Timestamp(0L)
+      case AttributeType.BINARY    => Array.emptyByteArray
+      case _ =>
+        throw new UnsupportedOperationException(
+          s"Unsupported attribute type for min value: $attrType"
+        )
+    }
+
   class AttributeTypeException(msg: String, cause: Throwable = null)
       extends IllegalArgumentException(msg, cause) {}
 }
diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/LargeBinary.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/LargeBinary.java
new file mode 100644
index 00000000000..9e8c4db870c
--- /dev/null
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/LargeBinary.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.core.tuple;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.apache.texera.amber.core.executor.OperatorExecutor;
+import org.apache.texera.service.util.LargeBinaryManager;
+
+import java.net.URI;
+import java.util.Objects;
+
+/**
+ * LargeBinary represents a reference to a large object stored in S3.
+ * 
+ * Each LargeBinary is identified by an S3 URI (s3://bucket/path/to/object).
+ * LargeBinaries are automatically tracked and cleaned up when the workflow execution completes.
+ */
+public class LargeBinary {
+    
+    private final String uri;
+    
+    /**
+     * Creates a LargeBinary from an existing S3 URI.
+     * Used primarily for deserialization from JSON.
+     * 
+     * @param uri S3 URI in the format s3://bucket/path/to/object
+     * @throws IllegalArgumentException if URI is null or doesn't start with "s3://"
+     */
+    @JsonCreator
+    public LargeBinary(@JsonProperty("uri") String uri) {
+        if (uri == null) {
+            throw new IllegalArgumentException("LargeBinary URI cannot be null");
+        }
+        if (!uri.startsWith("s3://")) {
+            throw new IllegalArgumentException(
+                "LargeBinary URI must start with 's3://', got: " + uri
+            );
+        }
+        this.uri = uri;
+    }
+    
+    /**
+     * Creates a new LargeBinary for writing data.
+     * Generates a unique S3 URI.
+     * 
+     * Usage example:
+     * 
+     *   LargeBinary largeBinary = new LargeBinary();
+     *   try (LargeBinaryOutputStream out = new LargeBinaryOutputStream(largeBinary)) {
+     *     out.write(data);
+     *   }
+     *   // largeBinary is now ready to be added to tuples
+     * 
+     */
+    public LargeBinary() {
+        this(LargeBinaryManager.create());
+    }
+    
+    @JsonValue
+    public String getUri() {
+        return uri;
+    }
+    
+    public String getBucketName() {
+        return URI.create(uri).getHost();
+    }
+    
+    public String getObjectKey() {
+        String path = URI.create(uri).getPath();
+        return path.startsWith("/") ? path.substring(1) : path;
+    }
+    
+    @Override
+    public String toString() {
+        return uri;
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof LargeBinary)) return false;
+        LargeBinary that = (LargeBinary) obj;
+        return Objects.equals(uri, that.uri);
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(uri);
+    }
+}
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Schema.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Schema.scala
similarity index 99%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Schema.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Schema.scala
index a3d06b7ae73..1dd38fbfe47 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Schema.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Schema.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty}
 import com.google.common.base.Preconditions.checkNotNull
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Tuple.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Tuple.scala
similarity index 95%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Tuple.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Tuple.scala
index 5299c77326e..cc3220827d0 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/Tuple.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Tuple.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
-import Tuple.checkSchemaMatchesFields
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty}
 import com.google.common.base.Preconditions.checkNotNull
+import org.apache.texera.amber.core.tuple.Tuple.checkSchemaMatchesFields
 import org.ehcache.sizeof.SizeOf
 
 import java.util
@@ -152,7 +152,7 @@ object Tuple {
       )
     ) {
       throw new RuntimeException(
-        s"edu.ics.uci.amber.model.tuple.model.Attribute ${attribute.getName}'s type (${attribute.getType}) is different from field's type (${AttributeType
+        s"Attribute ${attribute.getName}'s type (${attribute.getType}) is different from field's type (${AttributeType
           .getAttributeType(field.getClass)})"
       )
     }
@@ -190,7 +190,7 @@ object Tuple {
     }
 
     def add(attribute: Attribute, field: Any): Builder = {
-      require(attribute != null, "edu.ics.uci.amber.model.tuple.model.Attribute cannot be null")
+      require(attribute != null, "Attribute cannot be null")
       checkAttributeMatchesField(attribute, field)
 
       if (!schema.containsAttribute(attribute.getName)) {
@@ -206,7 +206,7 @@ object Tuple {
     def add(attributeName: String, attributeType: AttributeType, field: Any): Builder = {
       require(
         attributeName != null && attributeType != null,
-        "edu.ics.uci.amber.model.tuple.model.Attribute name and type cannot be null"
+        "Attribute name and type cannot be null"
       )
       this.add(new Attribute(attributeName, attributeType), field)
       this
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleLike.scala
similarity index 98%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleLike.scala
index 0cf030f964a..040b94977a1 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleLike.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleUtils.scala
similarity index 91%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleUtils.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleUtils.scala
index 187c0068fa8..6938dcc6ca8 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleUtils.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleUtils.scala
@@ -17,16 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
 import com.fasterxml.jackson.databind.JsonNode
-import edu.uci.ics.amber.util.JSONUtils.JSONToMap
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import AttributeTypeUtils.{inferSchemaFromRows, parseField}
+import com.fasterxml.jackson.databind.node.ObjectNode
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.{inferSchemaFromRows, parseField}
+import org.apache.texera.amber.util.JSONUtils
+import org.apache.texera.amber.util.JSONUtils.{JSONToMap, objectMapper}
 
 import scala.collection.mutable.ArrayBuffer
-import com.fasterxml.jackson.databind.node.ObjectNode
-import edu.uci.ics.amber.util.JSONUtils
 
 object TupleUtils {
 
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/LocationPreference.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/LocationPreference.scala
similarity index 96%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/LocationPreference.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/LocationPreference.scala
index 6f265c81749..a8308d3f3fd 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/LocationPreference.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/LocationPreference.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.workflow
+package org.apache.texera.amber.core.workflow
 
 // LocationPreference defines where operators should run.
 sealed trait LocationPreference extends Serializable
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PartitionInfo.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PartitionInfo.scala
similarity index 98%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PartitionInfo.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PartitionInfo.scala
index 645a170481b..90210c7a9b7 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PartitionInfo.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PartitionInfo.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.workflow
+package org.apache.texera.amber.core.workflow
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalOp.scala
similarity index 98%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalOp.scala
index 386c9e4bebd..0ac04c7a630 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalOp.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.workflow
+package org.apache.texera.amber.core.workflow
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonIgnoreProperties}
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.executor.{OpExecInitInfo, OpExecWithCode}
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.executor.{OpExecInitInfo, OpExecWithCode}
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   OperatorIdentity,
   PhysicalOpIdentity,
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalPlan.scala
similarity index 98%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalPlan.scala
index 9e6cd229f90..5a2a2a61b28 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalPlan.scala
@@ -17,20 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.workflow
+package org.apache.texera.amber.core.workflow
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   OperatorIdentity,
   PhysicalOpIdentity
 }
-import edu.uci.ics.amber.util.VirtualIdentityUtils
+import org.apache.texera.amber.util.VirtualIdentityUtils
 import org.jgrapht.alg.connectivity.BiconnectivityInspector
 import org.jgrapht.alg.shortestpath.AllDirectedPaths
-import org.jgrapht.alg.util.NeighborCache
 import org.jgrapht.graph.DirectedAcyclicGraph
 import org.jgrapht.traverse.TopologicalOrderIterator
 import org.jgrapht.util.SupplierUtil
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
similarity index 87%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
index d4d4552c2b7..ee7659d0ca9 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.workflow
+package org.apache.texera.amber.core.workflow
 
-import edu.uci.ics.amber.core.workflow.WorkflowContext.{
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.WorkflowContext.{
   DEFAULT_EXECUTION_ID,
   DEFAULT_WORKFLOW_ID,
   DEFAULT_WORKFLOW_SETTINGS
 }
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
 
 object WorkflowContext {
   val DEFAULT_EXECUTION_ID: ExecutionIdentity = ExecutionIdentity(1L)
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowSettings.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
similarity index 95%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowSettings.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
index 6aad439e846..88ebcb068f4 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowSettings.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.workflow
+package org.apache.texera.amber.core.workflow
 
 case class WorkflowSettings(
     dataTransferBatchSize: Int,
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/ArrowUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/ArrowUtils.scala
similarity index 82%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/ArrowUtils.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/ArrowUtils.scala
index b1c35d0f574..626047fda21 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/ArrowUtils.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/ArrowUtils.scala
@@ -17,15 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.AttributeTypeException
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, AttributeTypeUtils, Schema, Tuple}
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.AttributeTypeException
+import org.apache.texera.amber.core.tuple._
+import org.apache.arrow.memory.{BufferAllocator, RootAllocator}
 import org.apache.arrow.vector.types.FloatingPointPrecision
 import org.apache.arrow.vector.types.TimeUnit.MILLISECOND
 import org.apache.arrow.vector.types.pojo.ArrowType.PrimitiveType
-import org.apache.arrow.vector.types.pojo.{ArrowType, Field}
+import org.apache.arrow.vector.types.pojo.{ArrowType, Field, FieldType}
 import org.apache.arrow.vector.{
   BigIntVector,
   BitVector,
@@ -37,7 +38,6 @@ import org.apache.arrow.vector.{
   VarCharVector,
   VectorSchemaRoot
 }
-import org.apache.arrow.memory.{BufferAllocator, RootAllocator}
 
 import java.nio.charset.StandardCharsets
 import java.util
@@ -73,28 +73,28 @@ object ArrowUtils extends LazyLogging {
     Tuple
       .builder(schema)
       .addSequentially(
-        vectorSchemaRoot.getFieldVectors.asScala
-          .map((fieldVector: FieldVector) => {
+        vectorSchemaRoot.getFieldVectors.asScala.zipWithIndex.map {
+          case (fieldVector: FieldVector, index: Int) =>
             val value: AnyRef = fieldVector.getObject(rowIndex)
             try {
-              val arrowType = fieldVector.getField.getFieldType.getType
-              val attributeType = toAttributeType(arrowType)
+              // Use the attribute type from the schema (which includes metadata)
+              // instead of deriving it from the Arrow type
+              val attributeType = schema.getAttributes(index).getType
               AttributeTypeUtils.parseField(value, attributeType)
-
             } catch {
               case e: Exception =>
                 logger.warn("Caught error during parsing Arrow value back to Texera value", e)
                 null
             }
 
-          })
-          .toArray
+        }.toArray
       )
       .build()
   }
 
   /**
     * Converts an Arrow Schema into Texera Schema.
+    * Checks field metadata to detect LARGE_BINARY types.
     *
     * @param arrowSchema The Arrow Schema to be converted.
     * @return A Texera Schema.
@@ -102,7 +102,12 @@ object ArrowUtils extends LazyLogging {
   def toTexeraSchema(arrowSchema: org.apache.arrow.vector.types.pojo.Schema): Schema =
     Schema(
       arrowSchema.getFields.asScala.map { field =>
-        new Attribute(field.getName, toAttributeType(field.getType))
+        val isLargeBinary = Option(field.getMetadata)
+          .exists(m => m.containsKey("texera_type") && m.get("texera_type") == "LARGE_BINARY")
+
+        val attributeType =
+          if (isLargeBinary) AttributeType.LARGE_BINARY else toAttributeType(field.getType)
+        new Attribute(field.getName, attributeType)
       }.toList
     )
 
@@ -211,7 +216,7 @@ object ArrowUtils extends LazyLogging {
           else
             vector
               .asInstanceOf[VarCharVector]
-              .setSafe(index, value.asInstanceOf[String].getBytes(StandardCharsets.UTF_8))
+              .setSafe(index, value.toString.getBytes(StandardCharsets.UTF_8))
         case _: ArrowType.Binary | _: ArrowType.LargeBinary =>
           if (isNull) vector.asInstanceOf[VarBinaryVector].setNull(index)
           else
@@ -227,19 +232,27 @@ object ArrowUtils extends LazyLogging {
 
   /**
     * Converts an Amber schema into Arrow schema.
+    * Stores AttributeType in field metadata to preserve LARGE_BINARY type information.
     *
     * @param schema The Texera Schema.
     * @return An Arrow Schema.
     */
   def fromTexeraSchema(schema: Schema): org.apache.arrow.vector.types.pojo.Schema = {
-    val arrowFields = new util.ArrayList[Field]
-
-    for (amberAttribute <- schema.getAttributes) {
-      val name = amberAttribute.getName
-      val field = Field.nullablePrimitive(name, fromAttributeType(amberAttribute.getType))
-      arrowFields.add(field)
+    val arrowFields = schema.getAttributes.map { attribute =>
+      val metadata = if (attribute.getType == AttributeType.LARGE_BINARY) {
+        val map = new util.HashMap[String, String]()
+        map.put("texera_type", "LARGE_BINARY")
+        map
+      } else null
+
+      new Field(
+        attribute.getName,
+        new FieldType(true, fromAttributeType(attribute.getType), null, metadata),
+        null
+      )
     }
-    new org.apache.arrow.vector.types.pojo.Schema(arrowFields)
+
+    new org.apache.arrow.vector.types.pojo.Schema(util.Arrays.asList(arrowFields: _*))
   }
 
   /**
@@ -270,7 +283,7 @@ object ArrowUtils extends LazyLogging {
       case AttributeType.BINARY =>
         new ArrowType.Binary
 
-      case AttributeType.STRING | AttributeType.ANY =>
+      case AttributeType.STRING | AttributeType.LARGE_BINARY | AttributeType.ANY =>
         ArrowType.Utf8.INSTANCE
 
       case _ =>
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/IcebergUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala
similarity index 75%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/IcebergUtil.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala
index abd839f72fa..ad6ac07c1ff 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/IcebergUtil.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala
@@ -17,14 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, LargeBinary, Schema, Tuple}
 import org.apache.hadoop.conf.Configuration
 import org.apache.iceberg.catalog.{Catalog, TableIdentifier}
 import org.apache.iceberg.data.parquet.GenericParquetReaders
-import org.apache.iceberg.types.Types
 import org.apache.iceberg.data.{GenericRecord, Record}
 import org.apache.iceberg.hadoop.{HadoopCatalog, HadoopFileIO}
 import org.apache.iceberg.io.{CloseableIterable, InputFile}
@@ -32,6 +31,7 @@ import org.apache.iceberg.jdbc.JdbcCatalog
 import org.apache.iceberg.parquet.{Parquet, ParquetValueReader}
 import org.apache.iceberg.rest.RESTCatalog
 import org.apache.iceberg.types.Type.PrimitiveType
+import org.apache.iceberg.types.Types
 import org.apache.iceberg.{
   CatalogProperties,
   DataFile,
@@ -44,8 +44,7 @@ import org.apache.iceberg.{
 import java.nio.ByteBuffer
 import java.nio.file.Path
 import java.sql.Timestamp
-import java.time.LocalDateTime
-import java.time.ZoneId
+import java.time.{LocalDateTime, ZoneId}
 import scala.jdk.CollectionConverters._
 
 /**
@@ -53,6 +52,9 @@ import scala.jdk.CollectionConverters._
   */
 object IcebergUtil {
 
+  // Unique suffix for LARGE_BINARY field encoding
+  private val LARGE_BINARY_FIELD_SUFFIX = "__texera_large_binary_ptr"
+
   /**
     * Creates and initializes a HadoopCatalog with the given parameters.
     * - Uses an empty Hadoop `Configuration`, meaning the local file system (or `file:/`) will be used by default
@@ -201,6 +203,7 @@ object IcebergUtil {
 
   /**
     * Converts a custom Amber `Schema` to an Iceberg `Schema`.
+    * Field names are encoded to preserve LARGE_BINARY type information.
     *
     * @param amberSchema The custom Amber Schema.
     * @return An Iceberg Schema.
@@ -208,13 +211,16 @@ object IcebergUtil {
   def toIcebergSchema(amberSchema: Schema): IcebergSchema = {
     val icebergFields = amberSchema.getAttributes.zipWithIndex.map {
       case (attribute, index) =>
-        Types.NestedField.optional(index + 1, attribute.getName, toIcebergType(attribute.getType))
+        val encodedName = encodeLargeBinaryFieldName(attribute.getName, attribute.getType)
+        val icebergType = toIcebergType(attribute.getType)
+        Types.NestedField.optional(index + 1, encodedName, icebergType)
     }
     new IcebergSchema(icebergFields.asJava)
   }
 
   /**
     * Converts a custom Amber `AttributeType` to an Iceberg `Type`.
+    * Note: LARGE_BINARY is stored as StringType; field name encoding is used to distinguish it.
     *
     * @param attributeType The custom Amber AttributeType.
     * @return The corresponding Iceberg Type.
@@ -228,6 +234,8 @@ object IcebergUtil {
       case AttributeType.BOOLEAN   => Types.BooleanType.get()
       case AttributeType.TIMESTAMP => Types.TimestampType.withoutZone()
       case AttributeType.BINARY    => Types.BinaryType.get()
+      case AttributeType.LARGE_BINARY =>
+        Types.StringType.get() // Store LargeBinary URI as string
       case AttributeType.ANY =>
         throw new IllegalArgumentException("ANY type is not supported in Iceberg")
     }
@@ -244,13 +252,15 @@ object IcebergUtil {
 
     tuple.schema.getAttributes.zipWithIndex.foreach {
       case (attribute, index) =>
+        val fieldName = encodeLargeBinaryFieldName(attribute.getName, attribute.getType)
         val value = tuple.getField[AnyRef](index) match {
-          case null               => null
-          case ts: Timestamp      => ts.toInstant.atZone(ZoneId.systemDefault()).toLocalDateTime
-          case bytes: Array[Byte] => ByteBuffer.wrap(bytes)
-          case other              => other
+          case null                        => null
+          case ts: Timestamp               => ts.toInstant.atZone(ZoneId.systemDefault()).toLocalDateTime
+          case bytes: Array[Byte]          => ByteBuffer.wrap(bytes)
+          case largeBinaryPtr: LargeBinary => largeBinaryPtr.getUri
+          case other                       => other
         }
-        record.setField(attribute.getName, value)
+        record.setField(fieldName, value)
     }
 
     record
@@ -265,23 +275,72 @@ object IcebergUtil {
     */
   def fromRecord(record: Record, amberSchema: Schema): Tuple = {
     val fieldValues = amberSchema.getAttributes.map { attribute =>
-      val value = record.getField(attribute.getName) match {
+      val fieldName = encodeLargeBinaryFieldName(attribute.getName, attribute.getType)
+      val rawValue = record.getField(fieldName)
+
+      rawValue match {
         case null               => null
         case ldt: LocalDateTime => Timestamp.valueOf(ldt)
         case buffer: ByteBuffer =>
           val bytes = new Array[Byte](buffer.remaining())
           buffer.get(bytes)
           bytes
+        case uri: String if attribute.getType == AttributeType.LARGE_BINARY =>
+          new LargeBinary(uri)
         case other => other
       }
-      value
     }
 
     Tuple(amberSchema, fieldValues.toArray)
   }
 
+  /**
+    * Encodes a field name for LARGE_BINARY types by adding a unique system suffix.
+    * This ensures LARGE_BINARY fields can be identified when reading from Iceberg.
+    *
+    * @param fieldName The original field name
+    * @param attributeType The attribute type
+    * @return The encoded field name with a unique suffix for LARGE_BINARY types
+    */
+  private def encodeLargeBinaryFieldName(
+      fieldName: String,
+      attributeType: AttributeType
+  ): String = {
+    if (attributeType == AttributeType.LARGE_BINARY) {
+      s"${fieldName}${LARGE_BINARY_FIELD_SUFFIX}"
+    } else {
+      fieldName
+    }
+  }
+
+  /**
+    * Decodes a field name by removing the unique system suffix if present.
+    * This restores the original user-defined field name.
+    *
+    * @param fieldName The encoded field name
+    * @return The original field name with system suffix removed
+    */
+  private def decodeLargeBinaryFieldName(fieldName: String): String = {
+    if (isLargeBinaryField(fieldName)) {
+      fieldName.substring(0, fieldName.length - LARGE_BINARY_FIELD_SUFFIX.length)
+    } else {
+      fieldName
+    }
+  }
+
+  /**
+    * Checks if a field name indicates a LARGE_BINARY type by examining the unique suffix.
+    *
+    * @param fieldName The field name to check
+    * @return true if the field represents a LARGE_BINARY type, false otherwise
+    */
+  private def isLargeBinaryField(fieldName: String): Boolean = {
+    fieldName.endsWith(LARGE_BINARY_FIELD_SUFFIX)
+  }
+
   /**
     * Converts an Iceberg `Schema` to an Amber `Schema`.
+    * Field names are decoded to restore original names and detect LARGE_BINARY types.
     *
     * @param icebergSchema The Iceberg Schema.
     * @return The corresponding Amber Schema.
@@ -291,7 +350,10 @@ object IcebergUtil {
       .columns()
       .asScala
       .map { field =>
-        new Attribute(field.name(), fromIcebergType(field.`type`().asPrimitiveType()))
+        val fieldName = field.name()
+        val attributeType = fromIcebergType(field.`type`().asPrimitiveType(), fieldName)
+        val originalName = decodeLargeBinaryFieldName(fieldName)
+        new Attribute(originalName, attributeType)
       }
       .toList
 
@@ -302,11 +364,16 @@ object IcebergUtil {
     * Converts an Iceberg `Type` to an Amber `AttributeType`.
     *
     * @param icebergType The Iceberg Type.
+    * @param fieldName The field name (used to detect LARGE_BINARY by suffix).
     * @return The corresponding Amber AttributeType.
     */
-  def fromIcebergType(icebergType: PrimitiveType): AttributeType = {
+  def fromIcebergType(
+      icebergType: PrimitiveType,
+      fieldName: String = ""
+  ): AttributeType = {
     icebergType match {
-      case _: Types.StringType    => AttributeType.STRING
+      case _: Types.StringType =>
+        if (isLargeBinaryField(fieldName)) AttributeType.LARGE_BINARY else AttributeType.STRING
       case _: Types.IntegerType   => AttributeType.INTEGER
       case _: Types.LongType      => AttributeType.LONG
       case _: Types.DoubleType    => AttributeType.DOUBLE
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/JSONUtils.scala
similarity index 96%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/JSONUtils.scala
index ac01cf53045..1f99726ea7a 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/JSONUtils.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper}
 import com.fasterxml.jackson.module.noctordeser.NoCtorDeserModule
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import edu.uci.ics.amber.util.serde.{PortIdentityKeyDeserializer, PortIdentityKeySerializer}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.serde.{PortIdentityKeyDeserializer, PortIdentityKeySerializer}
 
 import java.text.SimpleDateFormat
 import scala.jdk.CollectionConverters.IteratorHasAsScala
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/VirtualIdentityUtils.scala
similarity index 97%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/VirtualIdentityUtils.scala
index 86d0f04d561..031c4b8c7f9 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/VirtualIdentityUtils.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.virtualidentity.{
   ActorVirtualIdentity,
   OperatorIdentity,
   PhysicalOpIdentity,
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/GlobalPortIdentitySerde.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/GlobalPortIdentitySerde.scala
similarity index 93%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/GlobalPortIdentitySerde.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/GlobalPortIdentitySerde.scala
index f69cf98fbaf..48c087443c1 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/GlobalPortIdentitySerde.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/GlobalPortIdentitySerde.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util.serde
-import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
+package org.apache.texera.amber.util.serde
+import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
 
 /**
   * Serialize and deserializes a GlobalPortIdentity object to a string using a custom, human-readable format
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeyDeserializer.scala
similarity index 92%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeyDeserializer.scala
index a198373490e..70d6e0ef696 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeyDeserializer.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util.serde
+package org.apache.texera.amber.util.serde
 
 import com.fasterxml.jackson.databind.{DeserializationContext, KeyDeserializer}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 class PortIdentityKeyDeserializer extends KeyDeserializer {
   override def deserializeKey(key: String, ctxt: DeserializationContext): PortIdentity = {
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeySerializer.scala
similarity index 88%
rename from core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala
rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeySerializer.scala
index de0659ff264..fc7e0ad72e7 100644
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala
+++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeySerializer.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util.serde
+package org.apache.texera.amber.util.serde
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.{JsonSerializer, SerializerProvider}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.util.serde.PortIdentityKeySerializer.portIdToString
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.serde.PortIdentityKeySerializer.portIdToString
 
 case object PortIdentityKeySerializer {
   def portIdToString(portId: PortIdentity): String = {
diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryInputStream.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryInputStream.scala
new file mode 100644
index 00000000000..e2af371e777
--- /dev/null
+++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryInputStream.scala
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import org.apache.texera.amber.core.tuple.LargeBinary
+
+import java.io.InputStream
+
+/**
+  * InputStream for reading LargeBinary data from S3.
+  *
+  * The underlying S3 download is lazily initialized on first read.
+  * The stream will fail if the S3 object doesn't exist when read is attempted.
+  *
+  * Usage:
+  * {{{
+  *   val largeBinary: LargeBinary = ...
+  *   try (val in = new LargeBinaryInputStream(largeBinary)) {
+  *     val bytes = in.readAllBytes()
+  *   }
+  * }}}
+  */
+class LargeBinaryInputStream(largeBinary: LargeBinary) extends InputStream {
+
+  require(largeBinary != null, "LargeBinary cannot be null")
+
+  // Lazy initialization - downloads only when first read() is called
+  private lazy val underlying: InputStream =
+    S3StorageClient.downloadObject(largeBinary.getBucketName, largeBinary.getObjectKey)
+
+  @volatile private var closed = false
+
+  override def read(): Int = whenOpen(underlying.read())
+
+  override def read(b: Array[Byte], off: Int, len: Int): Int =
+    whenOpen(underlying.read(b, off, len))
+
+  override def readAllBytes(): Array[Byte] = whenOpen(underlying.readAllBytes())
+
+  override def readNBytes(n: Int): Array[Byte] = whenOpen(underlying.readNBytes(n))
+
+  override def skip(n: Long): Long = whenOpen(underlying.skip(n))
+
+  override def available(): Int = whenOpen(underlying.available())
+
+  override def close(): Unit = {
+    if (!closed) {
+      closed = true
+      if (underlying != null) { // Only close if initialized
+        underlying.close()
+      }
+    }
+  }
+
+  override def markSupported(): Boolean = whenOpen(underlying.markSupported())
+
+  override def mark(readlimit: Int): Unit = whenOpen(underlying.mark(readlimit))
+
+  override def reset(): Unit = whenOpen(underlying.reset())
+
+  private def whenOpen[T](f: => T): T = {
+    if (closed) throw new java.io.IOException("Stream is closed")
+    f
+  }
+}
diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala
new file mode 100644
index 00000000000..211d7d3b757
--- /dev/null
+++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryManager.scala
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import com.typesafe.scalalogging.LazyLogging
+
+import java.util.UUID
+
+/**
+  * Manages the lifecycle of LargeBinaries stored in S3.
+  *
+  * Handles creation and deletion of large objects that exceed
+  * normal tuple size limits.
+  */
+object LargeBinaryManager extends LazyLogging {
+  private val DEFAULT_BUCKET = "texera-large-binaries"
+
+  /**
+    * Creates a new LargeBinary reference.
+    * The actual data upload happens separately via LargeBinaryOutputStream.
+    *
+    * @return S3 URI string for the new LargeBinary (format: s3://bucket/key)
+    */
+  def create(): String = {
+    S3StorageClient.createBucketIfNotExist(DEFAULT_BUCKET)
+
+    val objectKey = s"objects/${System.currentTimeMillis()}/${UUID.randomUUID()}"
+    val uri = s"s3://$DEFAULT_BUCKET/$objectKey"
+
+    uri
+  }
+
+  /**
+    * Deletes all large binaries from the bucket.
+    *
+    * @throws Exception if the deletion fails
+    * @return Unit
+    */
+  def deleteAllObjects(): Unit = {
+    try {
+      S3StorageClient.deleteDirectory(DEFAULT_BUCKET, "objects")
+      logger.info(s"Successfully deleted all large binaries from bucket: $DEFAULT_BUCKET")
+    } catch {
+      case e: Exception =>
+        logger.warn(s"Failed to delete large binaries from bucket: $DEFAULT_BUCKET", e)
+    }
+  }
+
+}
diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryOutputStream.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryOutputStream.scala
new file mode 100644
index 00000000000..ac6025146cb
--- /dev/null
+++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/LargeBinaryOutputStream.scala
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import com.typesafe.scalalogging.LazyLogging
+import org.apache.texera.amber.core.tuple.LargeBinary
+
+import java.io.{IOException, OutputStream, PipedInputStream, PipedOutputStream}
+import java.util.concurrent.atomic.AtomicReference
+import scala.concurrent.{Await, ExecutionContext, Future}
+import scala.concurrent.duration.Duration
+
+/**
+  * OutputStream for streaming LargeBinary data to S3.
+  *
+  * Data is uploaded in the background using multipart upload as you write.
+  * Call close() to complete the upload and ensure all data is persisted.
+  *
+  * Usage:
+  * {{{
+  *   val largeBinary = new LargeBinary()
+  *   try (val out = new LargeBinaryOutputStream(largeBinary)) {
+  *     out.write(myBytes)
+  *   }
+  *   // largeBinary is now ready to use
+  * }}}
+  *
+  * Note: Not thread-safe. Do not access from multiple threads concurrently.
+  *
+  * @param largeBinary The LargeBinary reference to write to
+  */
+class LargeBinaryOutputStream(largeBinary: LargeBinary) extends OutputStream with LazyLogging {
+
+  private val PIPE_BUFFER_SIZE = 64 * 1024 // 64KB
+
+  require(largeBinary != null, "LargeBinary cannot be null")
+
+  private val bucketName: String = largeBinary.getBucketName
+  private val objectKey: String = largeBinary.getObjectKey
+  private implicit val ec: ExecutionContext = ExecutionContext.global
+
+  // Pipe: we write to pipedOut, and S3 reads from pipedIn
+  private val pipedIn = new PipedInputStream(PIPE_BUFFER_SIZE)
+  private val pipedOut = new PipedOutputStream(pipedIn)
+
+  @volatile private var closed = false
+  private val uploadException = new AtomicReference[Option[Throwable]](None)
+
+  // Start background upload immediately
+  private val uploadFuture: Future[Unit] = Future {
+    try {
+      S3StorageClient.createBucketIfNotExist(bucketName)
+      S3StorageClient.uploadObject(bucketName, objectKey, pipedIn)
+      logger.debug(s"Upload completed: ${largeBinary.getUri}")
+    } catch {
+      case e: Exception =>
+        uploadException.set(Some(e))
+        logger.error(s"Upload failed: ${largeBinary.getUri}", e)
+    } finally {
+      pipedIn.close()
+    }
+  }
+
+  override def write(b: Int): Unit = whenOpen(pipedOut.write(b))
+
+  override def write(b: Array[Byte], off: Int, len: Int): Unit =
+    whenOpen(pipedOut.write(b, off, len))
+
+  override def flush(): Unit = {
+    if (!closed) pipedOut.flush()
+  }
+
+  /**
+    * Closes the stream and completes the S3 upload.
+    * Blocks until upload is complete. Throws IOException if upload failed.
+    */
+  override def close(): Unit = {
+    if (closed) return
+
+    closed = true
+    try {
+      pipedOut.close()
+      Await.result(uploadFuture, Duration.Inf)
+      checkUploadSuccess()
+    } catch {
+      case e: IOException => throw e
+      case e: Exception =>
+        S3StorageClient.deleteObject(bucketName, objectKey)
+        throw new IOException(s"Failed to complete upload: ${e.getMessage}", e)
+    }
+  }
+
+  private def whenOpen[T](f: => T): T = {
+    if (closed) throw new IOException("Stream is closed")
+    checkUploadSuccess()
+    f
+  }
+
+  private def checkUploadSuccess(): Unit = {
+    uploadException.get().foreach { ex =>
+      throw new IOException("Background upload failed", ex)
+    }
+  }
+}
diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
new file mode 100644
index 00000000000..b7a66a1bc89
--- /dev/null
+++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
@@ -0,0 +1,317 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import org.apache.texera.amber.config.StorageConfig
+import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider}
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.s3.model._
+import software.amazon.awssdk.services.s3.{S3Client, S3Configuration}
+import software.amazon.awssdk.core.sync.RequestBody
+
+import java.io.InputStream
+import java.security.MessageDigest
+import scala.jdk.CollectionConverters._
+
+/**
+  * S3Storage provides an abstraction for S3-compatible storage (e.g., MinIO).
+  * - Uses credentials and endpoint from StorageConfig.
+  * - Supports object upload, download, listing, and deletion.
+  */
+object S3StorageClient {
+  val MINIMUM_NUM_OF_MULTIPART_S3_PART: Long = 5L * 1024 * 1024 // 5 MiB
+  val MAXIMUM_NUM_OF_MULTIPART_S3_PARTS = 10_000
+
+  // Initialize MinIO-compatible S3 Client
+  private lazy val s3Client: S3Client = {
+    val credentials = AwsBasicCredentials.create(StorageConfig.s3Username, StorageConfig.s3Password)
+    S3Client
+      .builder()
+      .credentialsProvider(StaticCredentialsProvider.create(credentials))
+      .region(Region.of(StorageConfig.s3Region))
+      .endpointOverride(java.net.URI.create(StorageConfig.s3Endpoint)) // MinIO URL
+      .serviceConfiguration(
+        S3Configuration.builder().pathStyleAccessEnabled(true).build()
+      )
+      .build()
+  }
+
+  /**
+    * Checks if a directory (prefix) exists within an S3 bucket.
+    *
+    * @param bucketName The bucket name.
+    * @param directoryPrefix The directory (prefix) to check (must end with `/`).
+    * @return True if the directory contains at least one object, False otherwise.
+    */
+  def directoryExists(bucketName: String, directoryPrefix: String): Boolean = {
+    // Ensure the prefix ends with `/` to correctly match directories
+    val normalizedPrefix =
+      if (directoryPrefix.endsWith("/")) directoryPrefix else directoryPrefix + "/"
+
+    val listRequest = ListObjectsV2Request
+      .builder()
+      .bucket(bucketName)
+      .prefix(normalizedPrefix)
+      .maxKeys(1) // Only check if at least one object exists
+      .build()
+
+    val listResponse = s3Client.listObjectsV2(listRequest)
+    !listResponse.contents().isEmpty // If contents exist, directory exists
+  }
+
+  /**
+    * Creates an S3 bucket if it does not already exist.
+    *
+    * @param bucketName The name of the bucket to create.
+    */
+  def createBucketIfNotExist(bucketName: String): Unit = {
+    try {
+      // Check if the bucket already exists
+      s3Client.headBucket(HeadBucketRequest.builder().bucket(bucketName).build())
+    } catch {
+      case _: NoSuchBucketException | _: S3Exception =>
+        // If the bucket does not exist, create it
+        val createBucketRequest = CreateBucketRequest.builder().bucket(bucketName).build()
+        s3Client.createBucket(createBucketRequest)
+        println(s"Bucket '$bucketName' created successfully.")
+    }
+  }
+
+  /**
+    * Deletes a directory (all objects under a given prefix) from a bucket.
+    *
+    * @param bucketName Target S3/MinIO bucket.
+    * @param directoryPrefix The directory to delete (must end with `/`).
+    */
+  def deleteDirectory(bucketName: String, directoryPrefix: String): Unit = {
+    // Ensure the directory prefix ends with `/` to avoid accidental deletions
+    val prefix = if (directoryPrefix.endsWith("/")) directoryPrefix else directoryPrefix + "/"
+
+    // List objects under the given prefix
+    val listRequest = ListObjectsV2Request
+      .builder()
+      .bucket(bucketName)
+      .prefix(prefix)
+      .build()
+
+    val listResponse = s3Client.listObjectsV2(listRequest)
+
+    // Extract object keys
+    val objectKeys = listResponse.contents().asScala.map(_.key())
+
+    if (objectKeys.nonEmpty) {
+      val objectsToDelete =
+        objectKeys.map(key => ObjectIdentifier.builder().key(key).build()).asJava
+
+      val deleteRequest = Delete
+        .builder()
+        .objects(objectsToDelete)
+        .build()
+
+      // Compute MD5 checksum for MinIO if required
+      val md5Hash = MessageDigest
+        .getInstance("MD5")
+        .digest(deleteRequest.toString.getBytes("UTF-8"))
+
+      // Convert object keys to S3 DeleteObjectsRequest format
+      val deleteObjectsRequest = DeleteObjectsRequest
+        .builder()
+        .bucket(bucketName)
+        .delete(deleteRequest)
+        .build()
+
+      // Perform batch deletion
+      s3Client.deleteObjects(deleteObjectsRequest)
+    }
+  }
+
+  /**
+    * Uploads an object to S3 using multipart upload.
+    * Handles streams of any size without loading into memory.
+    */
+  def uploadObject(bucketName: String, objectKey: String, inputStream: InputStream): String = {
+    val buffer = new Array[Byte](MINIMUM_NUM_OF_MULTIPART_S3_PART.toInt)
+
+    // Helper to read a full buffer from input stream
+    def readChunk(): Int = {
+      var offset = 0
+      var read = 0
+      while (
+        offset < buffer.length && {
+          read = inputStream.read(buffer, offset, buffer.length - offset); read > 0
+        }
+      ) {
+        offset += read
+      }
+      offset
+    }
+
+    // Read first chunk to check if stream is empty
+    val firstChunkSize = readChunk()
+    if (firstChunkSize == 0) {
+      return s3Client
+        .putObject(
+          PutObjectRequest.builder().bucket(bucketName).key(objectKey).build(),
+          RequestBody.fromBytes(Array.empty[Byte])
+        )
+        .eTag()
+    }
+
+    val uploadId = s3Client
+      .createMultipartUpload(
+        CreateMultipartUploadRequest.builder().bucket(bucketName).key(objectKey).build()
+      )
+      .uploadId()
+
+    var uploadSuccess = false
+    try {
+      // Upload all parts using an iterator
+      val allParts = Iterator
+        .iterate((1, firstChunkSize)) { case (partNum, _) => (partNum + 1, readChunk()) }
+        .takeWhile { case (_, size) => size > 0 }
+        .map {
+          case (partNumber, chunkSize) =>
+            val eTag = s3Client
+              .uploadPart(
+                UploadPartRequest
+                  .builder()
+                  .bucket(bucketName)
+                  .key(objectKey)
+                  .uploadId(uploadId)
+                  .partNumber(partNumber)
+                  .build(),
+                RequestBody.fromBytes(buffer.take(chunkSize))
+              )
+              .eTag()
+            CompletedPart.builder().partNumber(partNumber).eTag(eTag).build()
+        }
+        .toList
+
+      val result = s3Client
+        .completeMultipartUpload(
+          CompleteMultipartUploadRequest
+            .builder()
+            .bucket(bucketName)
+            .key(objectKey)
+            .uploadId(uploadId)
+            .multipartUpload(CompletedMultipartUpload.builder().parts(allParts.asJava).build())
+            .build()
+        )
+        .eTag()
+
+      uploadSuccess = true
+      result
+
+    } finally {
+      if (!uploadSuccess) {
+        try {
+          s3Client.abortMultipartUpload(
+            AbortMultipartUploadRequest
+              .builder()
+              .bucket(bucketName)
+              .key(objectKey)
+              .uploadId(uploadId)
+              .build()
+          )
+        } catch { case _: Exception => }
+      }
+    }
+  }
+
+  /**
+    * Downloads an object from S3 as an InputStream.
+    *
+    * @param bucketName The S3 bucket name.
+    * @param objectKey The object key (path) in S3.
+    * @return An InputStream containing the object data.
+    */
+  def downloadObject(bucketName: String, objectKey: String): InputStream = {
+    s3Client.getObject(
+      GetObjectRequest.builder().bucket(bucketName).key(objectKey).build()
+    )
+  }
+
+  /**
+    * Deletes a single object from S3.
+    *
+    * @param bucketName The S3 bucket name.
+    * @param objectKey The object key (path) in S3.
+    */
+  def deleteObject(bucketName: String, objectKey: String): Unit = {
+    s3Client.deleteObject(
+      DeleteObjectRequest.builder().bucket(bucketName).key(objectKey).build()
+    )
+  }
+
+  /**
+    * Uploads a single part for an in-progress S3 multipart upload.
+    *
+    * This method wraps the AWS SDK v2 {@code UploadPart} API:
+    * it builds an {@link software.amazon.awssdk.services.s3.model.UploadPartRequest}
+    * and streams the part payload via a {@link software.amazon.awssdk.core.sync.RequestBody}.
+    *
+    * Payload handling:
+    *   - If {@code contentLength} is provided, the payload is streamed directly from {@code inputStream}
+    *     using {@code RequestBody.fromInputStream(inputStream, len)}.
+    *   - If {@code contentLength} is {@code None}, the entire {@code inputStream} is read into memory
+    *     ({@code readAllBytes}) and uploaded using {@code RequestBody.fromBytes(bytes)}.
+    *     This is convenient but can be memory-expensive for large parts; prefer providing a known length.
+    *
+    * Notes:
+    *   - {@code partNumber} must be in the valid S3 range (typically 1..10,000).
+    *   - The caller is responsible for closing {@code inputStream}.
+    *   - This method is synchronous and will block the calling thread until the upload completes.
+    *
+    * @param bucket        S3 bucket name.
+    * @param key           Object key (path) being uploaded.
+    * @param uploadId      Multipart upload identifier returned by CreateMultipartUpload.
+    * @param partNumber    1-based part number for this upload.
+    * @param inputStream   Stream containing the bytes for this part.
+    * @param contentLength Optional size (in bytes) of this part; provide it to avoid buffering in memory.
+    * @return              The {@link software.amazon.awssdk.services.s3.model.UploadPartResponse},
+    *                      including the part ETag used for completing the multipart upload.
+    */
+  def uploadPartWithRequest(
+      bucket: String,
+      key: String,
+      uploadId: String,
+      partNumber: Int,
+      inputStream: InputStream,
+      contentLength: Option[Long]
+  ): UploadPartResponse = {
+    val requestBody: RequestBody = contentLength match {
+      case Some(len) => RequestBody.fromInputStream(inputStream, len)
+      case None =>
+        val bytes = inputStream.readAllBytes()
+        RequestBody.fromBytes(bytes)
+    }
+
+    val req = UploadPartRequest
+      .builder()
+      .bucket(bucket)
+      .key(key)
+      .uploadId(uploadId)
+      .partNumber(partNumber)
+      .build()
+
+    s3Client.uploadPart(req, requestBody)
+  }
+
+}
diff --git a/core/workflow-compiling-service/src/test/resources/country_sales_small.csv b/common/workflow-core/src/test/resources/country_sales_small.csv
similarity index 100%
rename from core/workflow-compiling-service/src/test/resources/country_sales_small.csv
rename to common/workflow-core/src/test/resources/country_sales_small.csv
diff --git a/core/workflow-core/src/test/resources/datasets/1/directory/a.csv b/common/workflow-core/src/test/resources/datasets/1/directory/a.csv
similarity index 100%
rename from core/workflow-core/src/test/resources/datasets/1/directory/a.csv
rename to common/workflow-core/src/test/resources/datasets/1/directory/a.csv
diff --git a/core/workflow-core/src/test/resources/datasets/1/random_data.csv b/common/workflow-core/src/test/resources/datasets/1/random_data.csv
similarity index 100%
rename from core/workflow-core/src/test/resources/datasets/1/random_data.csv
rename to common/workflow-core/src/test/resources/datasets/1/random_data.csv
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/storage/model/VirtualDocumentSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/storage/model/VirtualDocumentSpec.scala
similarity index 99%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/core/storage/model/VirtualDocumentSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/storage/model/VirtualDocumentSpec.scala
index 2bc0bb78a63..3b8e04189cb 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/storage/model/VirtualDocumentSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/storage/model/VirtualDocumentSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.storage.model
+package org.apache.texera.amber.core.storage.model
 
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/AttributeTypeUtilsSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtilsSpec.scala
similarity index 51%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/AttributeTypeUtilsSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtilsSpec.scala
index abba5e0ef01..446ce518faf 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/AttributeTypeUtilsSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtilsSpec.scala
@@ -17,18 +17,27 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
-import edu.uci.ics.amber.core.tuple.AttributeType._
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.{
+import org.apache.texera.amber.core.tuple.AttributeType._
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.{
   AttributeTypeException,
+  add,
+  compare,
   inferField,
   inferSchemaFromRows,
-  parseField
+  maxValue,
+  minValue,
+  parseField,
+  zeroValue
 }
 import org.scalatest.funsuite.AnyFunSuite
 
+import java.sql.Timestamp
+import java.time.{Instant, LocalDate, LocalDateTime, OffsetDateTime, ZoneId, ZonedDateTime}
+
 class AttributeTypeUtilsSpec extends AnyFunSuite {
+
   // Unit Test for Infer Schema
 
   test("type should get inferred correctly individually") {
@@ -173,9 +182,41 @@ class AttributeTypeUtilsSpec extends AnyFunSuite {
         .getTime == 1699820130000L
     )
 
+    val localDateTime = LocalDateTime.of(2023, 11, 13, 10, 15, 30)
+    val timestampFromLocalDateTime =
+      parseField(localDateTime, AttributeType.TIMESTAMP).asInstanceOf[Timestamp]
+    assert(timestampFromLocalDateTime == Timestamp.valueOf(localDateTime))
+
+    val instant = Instant.parse("2023-11-13T10:15:30Z")
+    val timestampFromInstant = parseField(instant, AttributeType.TIMESTAMP).asInstanceOf[Timestamp]
+    assert(timestampFromInstant == Timestamp.from(instant))
+
+    val offsetDateTime = OffsetDateTime.parse("2023-11-13T12:15:30+02:00")
+    val timestampFromOffsetDateTime =
+      parseField(offsetDateTime, AttributeType.TIMESTAMP).asInstanceOf[Timestamp]
+    assert(timestampFromOffsetDateTime == Timestamp.from(offsetDateTime.toInstant))
+
+    val zonedDateTime =
+      ZonedDateTime.of(2023, 11, 13, 2, 15, 30, 0, ZoneId.of("America/Los_Angeles"))
+    val timestampFromZonedDateTime =
+      parseField(zonedDateTime, AttributeType.TIMESTAMP).asInstanceOf[Timestamp]
+    assert(timestampFromZonedDateTime == Timestamp.from(zonedDateTime.toInstant))
+
+    val localDate = LocalDate.of(2023, 11, 13)
+    val timestampFromLocalDate =
+      parseField(localDate, AttributeType.TIMESTAMP).asInstanceOf[Timestamp]
+    assert(timestampFromLocalDate == Timestamp.valueOf(localDate.atStartOfDay()))
+
+    val utilDate = new java.util.Date(1699820130000L)
+    val timestampFromDate = parseField(utilDate, AttributeType.TIMESTAMP).asInstanceOf[Timestamp]
+    assert(timestampFromDate.getTime == 1699820130000L)
+
     assertThrows[AttributeTypeException] {
       parseField("invalid", AttributeType.TIMESTAMP)
     }
+    assertThrows[AttributeTypeException] {
+      parseField(123.45, AttributeType.TIMESTAMP)
+    }
   }
 
   test("parseField correctly parses to STRING") {
@@ -190,4 +231,152 @@ class AttributeTypeUtilsSpec extends AnyFunSuite {
     assert(parseField("anything", AttributeType.ANY) == "anything")
   }
 
+  test("parseField correctly parses to LARGE_BINARY") {
+    // Valid S3 URI strings are converted to LargeBinary
+    val pointer1 = parseField("s3://bucket/path/to/object", AttributeType.LARGE_BINARY)
+      .asInstanceOf[LargeBinary]
+    assert(pointer1.getUri == "s3://bucket/path/to/object")
+    assert(pointer1.getBucketName == "bucket")
+    assert(pointer1.getObjectKey == "path/to/object")
+
+    // Null input returns null
+    assert(parseField(null, AttributeType.LARGE_BINARY) == null)
+  }
+
+  test("LARGE_BINARY type is preserved but never inferred from data") {
+    // LARGE_BINARY remains LARGE_BINARY when passed as typeSoFar
+    assert(inferField(AttributeType.LARGE_BINARY, "any-value") == AttributeType.LARGE_BINARY)
+    assert(inferField(AttributeType.LARGE_BINARY, null) == AttributeType.LARGE_BINARY)
+
+    // String data is inferred as STRING, never LARGE_BINARY
+    assert(inferField("s3://bucket/path") == AttributeType.STRING)
+  }
+
+  test("compare correctly handles null values for different attribute types") {
+    assert(compare(null, null, INTEGER) == 0)
+    assert(compare(null, 10, INTEGER) < 0)
+    assert(compare(10, null, INTEGER) > 0)
+  }
+
+  test("compare correctly orders numeric, boolean, timestamp, string and binary values") {
+    assert(compare(1, 2, INTEGER) < 0)
+    assert(compare(2, 1, INTEGER) > 0)
+    assert(compare(5, 5, INTEGER) == 0)
+
+    assert(compare(false, true, BOOLEAN) < 0)
+    assert(compare(true, false, BOOLEAN) > 0)
+    assert(compare(true, true, BOOLEAN) == 0)
+
+    val earlierTimestamp = new java.sql.Timestamp(1000L)
+    val laterTimestamp = new java.sql.Timestamp(2000L)
+    assert(compare(earlierTimestamp, laterTimestamp, TIMESTAMP) < 0)
+    assert(compare(laterTimestamp, earlierTimestamp, TIMESTAMP) > 0)
+
+    assert(compare("apple", "banana", STRING) < 0)
+    assert(compare("banana", "apple", STRING) > 0)
+    assert(compare("same", "same", STRING) == 0)
+
+    val firstBytes = Array[Byte](0, 1, 2)
+    val secondBytes = Array[Byte](0, 2, 0)
+    assert(compare(firstBytes, secondBytes, BINARY) < 0)
+  }
+
+  test("add correctly handles null values as identity for numeric types") {
+    val integerZeroFromAdd = add(null, null, INTEGER).asInstanceOf[Int]
+    assert(integerZeroFromAdd == 0)
+
+    val rightOnlyResult =
+      add(null, java.lang.Integer.valueOf(5), INTEGER).asInstanceOf[Int]
+    assert(rightOnlyResult == 5)
+
+    val leftOnlyResult =
+      add(java.lang.Integer.valueOf(7), null, INTEGER).asInstanceOf[Int]
+    assert(leftOnlyResult == 7)
+  }
+
+  test("add correctly adds integer, long, double and timestamp values") {
+    val integerSum =
+      add(java.lang.Integer.valueOf(3), java.lang.Integer.valueOf(4), INTEGER)
+        .asInstanceOf[Int]
+    assert(integerSum == 7)
+
+    val longSum =
+      add(java.lang.Long.valueOf(10L), java.lang.Long.valueOf(5L), LONG)
+        .asInstanceOf[Long]
+    assert(longSum == 15L)
+
+    val doubleSum =
+      add(java.lang.Double.valueOf(1.5), java.lang.Double.valueOf(2.5), DOUBLE)
+        .asInstanceOf[Double]
+    assert(doubleSum == 4.0)
+
+    val firstTimestamp = new java.sql.Timestamp(1000L)
+    val secondTimestamp = new java.sql.Timestamp(2500L)
+    val timestampSum =
+      add(firstTimestamp, secondTimestamp, TIMESTAMP).asInstanceOf[java.sql.Timestamp]
+    assert(timestampSum.getTime == 3500L)
+  }
+
+  test("zeroValue returns correct numeric and timestamp identity values") {
+    val integerZero = zeroValue(INTEGER).asInstanceOf[Int]
+    val longZero = zeroValue(LONG).asInstanceOf[Long]
+    val doubleZero = zeroValue(DOUBLE).asInstanceOf[Double]
+    val timestampZero = zeroValue(TIMESTAMP).asInstanceOf[java.sql.Timestamp]
+
+    assert(integerZero == 0)
+    assert(longZero == 0L)
+    assert(doubleZero == 0.0d)
+    assert(timestampZero.getTime == 0L)
+  }
+
+  test("zeroValue returns empty binary array and fails for unsupported types") {
+    val binaryZero = zeroValue(BINARY).asInstanceOf[Array[Byte]]
+    assert(binaryZero.isEmpty)
+
+    assertThrows[UnsupportedOperationException] {
+      zeroValue(STRING)
+    }
+  }
+
+  test("maxValue returns correct maximum numeric bounds") {
+    val integerMax = maxValue(INTEGER).asInstanceOf[Int]
+    val longMax = maxValue(LONG).asInstanceOf[Long]
+    val doubleMax = maxValue(DOUBLE).asInstanceOf[Double]
+
+    assert(integerMax == Int.MaxValue)
+    assert(longMax == Long.MaxValue)
+    assert(doubleMax == Double.MaxValue)
+  }
+
+  test("maxValue returns maximum timestamp and fails for unsupported types") {
+    val timestampMax = maxValue(TIMESTAMP).asInstanceOf[java.sql.Timestamp]
+    assert(timestampMax.getTime == Long.MaxValue)
+
+    assertThrows[UnsupportedOperationException] {
+      maxValue(BOOLEAN)
+    }
+  }
+
+  test("minValue returns correct minimum numeric bounds") {
+    val integerMin = minValue(INTEGER).asInstanceOf[Int]
+    val longMin = minValue(LONG).asInstanceOf[Long]
+    val doubleMin = minValue(DOUBLE).asInstanceOf[Double]
+
+    assert(integerMin == Int.MinValue)
+    assert(longMin == Long.MinValue)
+    assert(doubleMin == java.lang.Double.NEGATIVE_INFINITY)
+  }
+
+  test("minValue returns timestamp epoch and empty binary array, and fails for unsupported types") {
+    val timestampMin = minValue(TIMESTAMP).asInstanceOf[java.sql.Timestamp]
+    val binaryMin = minValue(BINARY).asInstanceOf[Array[Byte]]
+
+    assert(timestampMin.getTime == 0L)
+
+    assert(binaryMin.isEmpty)
+
+    assertThrows[UnsupportedOperationException] {
+      minValue(STRING)
+    }
+  }
 }
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/SchemaSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/SchemaSpec.scala
similarity index 99%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/SchemaSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/SchemaSpec.scala
index 5563d5824c5..1e2d22d6a33 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/SchemaSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/SchemaSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/TupleSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/TupleSpec.scala
similarity index 98%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/TupleSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/TupleSpec.scala
index c38c7e5602e..4adb48fa0d7 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/core/tuple/TupleSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/TupleSpec.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.core.tuple
+package org.apache.texera.amber.core.tuple
 
-import edu.uci.ics.amber.core.tuple.TupleUtils.{json2tuple, tuple2json}
+import org.apache.texera.amber.core.tuple.TupleUtils.{json2tuple, tuple2json}
 import org.scalatest.flatspec.AnyFlatSpec
 
 import java.sql.Timestamp
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/FileResolverSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/FileResolverSpec.scala
similarity index 89%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/FileResolverSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/FileResolverSpec.scala
index 787510d8f12..593ac8d3471 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/FileResolverSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/FileResolverSpec.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.storage
+package org.apache.texera.amber.storage
 
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{DatasetDao, DatasetVersionDao, UserDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Dataset, DatasetVersion, User}
+import org.apache.texera.amber.core.storage.FileResolver
 import org.apache.commons.vfs2.FileNotFoundException
-import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{DatasetDao, DatasetVersionDao, UserDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Dataset, DatasetVersion, User}
 import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 
 import java.nio.file.Paths
 
@@ -77,7 +77,7 @@ class FileResolverSpec
     datasetVersion
   }
 
-  private val localCsvFilePath = "workflow-core/src/test/resources/country_sales_small.csv"
+  private val localCsvFilePath = "common/workflow-core/src/test/resources/country_sales_small.csv"
 
   private val datasetACsvFilePath = "/test_user@test.com/test_dataset/v2/directory/a.csv"
 
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala
similarity index 88%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala
index bc54837fee7..4a1827b0915 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.storage.result.iceberg
+package org.apache.texera.amber.storage.result.iceberg
 
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.storage.model._
-import edu.uci.ics.amber.core.storage.result.ResultSchema
-import edu.uci.ics.amber.core.tuple.{Schema, Tuple}
-import edu.uci.ics.amber.core.virtualidentity._
+import org.apache.texera.amber.core.storage.model._
+import org.apache.texera.amber.core.storage.result.ResultSchema
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.{Schema, Tuple}
+import org.apache.texera.amber.core.virtualidentity._
+import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
-import org.scalatest.BeforeAndAfterAll
 
-import scala.util.{Try, Using}
 import java.net.URI
 import scala.util.Using.Releasable
+import scala.util.{Try, Using}
 
 class IcebergDocumentConsoleMessagesSpec
     extends AnyFlatSpec
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergDocumentSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala
similarity index 92%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergDocumentSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala
index 00790e88468..fe06a47d191 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergDocumentSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.storage.result.iceberg
+package org.apache.texera.amber.storage.result.iceberg
 
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.core.storage.model.{VirtualDocument, VirtualDocumentSpec}
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.storage.model.{VirtualDocument, VirtualDocumentSpec}
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   OperatorIdentity,
   PhysicalOpIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
-import edu.uci.ics.amber.util.IcebergUtil
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.iceberg.catalog.Catalog
 import org.apache.iceberg.data.Record
 import org.apache.iceberg.{Schema => IcebergSchema}
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergTableStatsSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergTableStatsSpec.scala
similarity index 94%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergTableStatsSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergTableStatsSpec.scala
index 62d102fbba2..175ebc2c01b 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/storage/result/iceberg/IcebergTableStatsSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergTableStatsSpec.scala
@@ -17,29 +17,29 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.storage.result.iceberg
+package org.apache.texera.amber.storage.result.iceberg
 
-import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory}
-import edu.uci.ics.amber.util.IcebergUtil
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.storage.model.VirtualDocument
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   OperatorIdentity,
   PhysicalOpIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
-import org.apache.iceberg.{Schema => IcebergSchema}
+import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity}
+import org.apache.texera.amber.util.IcebergUtil
 import org.apache.iceberg.catalog.Catalog
 import org.apache.iceberg.data.Record
+import org.apache.iceberg.{Schema => IcebergSchema}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.{BeforeAndAfterAll, Suite}
 
 import java.net.URI
 import java.sql.Timestamp
-import java.time.{LocalDate, ZoneId}
 import java.time.format.DateTimeFormatter
+import java.time.{LocalDate, ZoneId}
 import java.util.UUID
 
 class IcebergTableStatsSpec extends AnyFlatSpec with BeforeAndAfterAll with Suite {
diff --git a/core/workflow-core/src/test/scala/edu/uci/ics/amber/util/IcebergUtilSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/util/IcebergUtilSpec.scala
similarity index 66%
rename from core/workflow-core/src/test/scala/edu/uci/ics/amber/util/IcebergUtilSpec.scala
rename to common/workflow-core/src/test/scala/org/apache/texera/amber/util/IcebergUtilSpec.scala
index b95c58e71b4..da15a8060d3 100644
--- a/core/workflow-core/src/test/scala/edu/uci/ics/amber/util/IcebergUtilSpec.scala
+++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/util/IcebergUtilSpec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, Tuple}
-import edu.uci.ics.amber.util.IcebergUtil.toIcebergSchema
+import org.apache.texera.amber.core.tuple.{AttributeType, LargeBinary, Schema, Tuple}
+import org.apache.texera.amber.util.IcebergUtil.toIcebergSchema
+import org.apache.iceberg.data.GenericRecord
 import org.apache.iceberg.types.Types
 import org.apache.iceberg.{Schema => IcebergSchema}
-import org.apache.iceberg.data.GenericRecord
 import org.scalatest.flatspec.AnyFlatSpec
 
 import java.nio.ByteBuffer
@@ -199,4 +199,103 @@ class IcebergUtilSpec extends AnyFlatSpec {
     assert(tuple.getField[String]("test-6") == "hello world")
     assert(tuple.getField[Array[Byte]]("test-7") sameElements Array[Byte](1, 2, 3, 4))
   }
+
+  // LARGE_BINARY type tests
+
+  it should "convert LARGE_BINARY type correctly between Texera and Iceberg" in {
+    // LARGE_BINARY stored as StringType with field name suffix
+    assert(IcebergUtil.toIcebergType(AttributeType.LARGE_BINARY) == Types.StringType.get())
+    assert(IcebergUtil.fromIcebergType(Types.StringType.get(), "field") == AttributeType.STRING)
+    assert(
+      IcebergUtil.fromIcebergType(
+        Types.StringType.get(),
+        "field__texera_large_binary_ptr"
+      ) == AttributeType.LARGE_BINARY
+    )
+  }
+
+  it should "convert schemas with LARGE_BINARY fields correctly" in {
+    val texeraSchema = Schema()
+      .add("id", AttributeType.INTEGER)
+      .add("large_data", AttributeType.LARGE_BINARY)
+
+    val icebergSchema = IcebergUtil.toIcebergSchema(texeraSchema)
+
+    // LARGE_BINARY field gets encoded name with suffix
+    assert(icebergSchema.findField("large_data__texera_large_binary_ptr") != null)
+    assert(
+      icebergSchema.findField("large_data__texera_large_binary_ptr").`type`() == Types.StringType
+        .get()
+    )
+
+    // Round-trip preserves schema
+    val roundTripSchema = IcebergUtil.fromIcebergSchema(icebergSchema)
+    assert(roundTripSchema.getAttribute("large_data").getType == AttributeType.LARGE_BINARY)
+  }
+
+  it should "convert tuples with LARGE_BINARY to records and back correctly" in {
+    val schema = Schema()
+      .add("id", AttributeType.INTEGER)
+      .add("large_data", AttributeType.LARGE_BINARY)
+
+    val tuple = Tuple
+      .builder(schema)
+      .addSequentially(Array(Int.box(42), new LargeBinary("s3://bucket/object/key.data")))
+      .build()
+
+    val record = IcebergUtil.toGenericRecord(toIcebergSchema(schema), tuple)
+
+    // LARGE_BINARY stored as URI string with encoded field name
+    assert(record.getField("id") == 42)
+    assert(record.getField("large_data__texera_large_binary_ptr") == "s3://bucket/object/key.data")
+
+    // Round-trip preserves data
+    val roundTripTuple = IcebergUtil.fromRecord(record, schema)
+    assert(roundTripTuple == tuple)
+
+    // LargeBinary properties are accessible
+    val largeBinary = roundTripTuple.getField[LargeBinary]("large_data")
+    assert(largeBinary.getUri == "s3://bucket/object/key.data")
+    assert(largeBinary.getBucketName == "bucket")
+    assert(largeBinary.getObjectKey == "object/key.data")
+  }
+
+  it should "handle null LARGE_BINARY values correctly" in {
+    val schema = Schema().add("data", AttributeType.LARGE_BINARY)
+
+    val tupleWithNull = Tuple.builder(schema).addSequentially(Array(null)).build()
+    val record = IcebergUtil.toGenericRecord(toIcebergSchema(schema), tupleWithNull)
+
+    assert(record.getField("data__texera_large_binary_ptr") == null)
+    assert(IcebergUtil.fromRecord(record, schema) == tupleWithNull)
+  }
+
+  it should "handle multiple LARGE_BINARY fields and mixed types correctly" in {
+    val schema = Schema()
+      .add("int_field", AttributeType.INTEGER)
+      .add("large_binary_1", AttributeType.LARGE_BINARY)
+      .add("string_field", AttributeType.STRING)
+      .add("large_binary_2", AttributeType.LARGE_BINARY)
+
+    val tuple = Tuple
+      .builder(schema)
+      .addSequentially(
+        Array(
+          Int.box(123),
+          new LargeBinary("s3://bucket1/file1.dat"),
+          "normal string",
+          null // null LARGE_BINARY
+        )
+      )
+      .build()
+
+    val record = IcebergUtil.toGenericRecord(toIcebergSchema(schema), tuple)
+
+    assert(record.getField("int_field") == 123)
+    assert(record.getField("large_binary_1__texera_large_binary_ptr") == "s3://bucket1/file1.dat")
+    assert(record.getField("string_field") == "normal string")
+    assert(record.getField("large_binary_2__texera_large_binary_ptr") == null)
+
+    assert(IcebergUtil.fromRecord(record, schema) == tuple)
+  }
 }
diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryInputStreamSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryInputStreamSpec.scala
new file mode 100644
index 00000000000..0e307d8e42c
--- /dev/null
+++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryInputStreamSpec.scala
@@ -0,0 +1,352 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import org.apache.texera.amber.core.tuple.LargeBinary
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.scalatest.funsuite.AnyFunSuite
+
+import java.io.{ByteArrayInputStream, IOException}
+import scala.util.Random
+
+class LargeBinaryInputStreamSpec
+    extends AnyFunSuite
+    with S3StorageTestBase
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach {
+
+  private val testBucketName = "test-large-binary-input-stream"
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    S3StorageClient.createBucketIfNotExist(testBucketName)
+  }
+
+  override def afterAll(): Unit = {
+    try {
+      S3StorageClient.deleteDirectory(testBucketName, "")
+    } catch {
+      case _: Exception => // Ignore cleanup errors
+    }
+    super.afterAll()
+  }
+
+  // Helper methods
+  private def createTestObject(key: String, data: Array[Byte]): LargeBinary = {
+    S3StorageClient.uploadObject(testBucketName, key, new ByteArrayInputStream(data))
+    new LargeBinary(s"s3://$testBucketName/$key")
+  }
+
+  private def createTestObject(key: String, data: String): LargeBinary =
+    createTestObject(key, data.getBytes)
+
+  private def generateRandomData(size: Int): Array[Byte] =
+    Array.fill[Byte](size)((Random.nextInt(256) - 128).toByte)
+
+  private def withStream[T](largeBinary: LargeBinary)(f: LargeBinaryInputStream => T): T = {
+    val stream = new LargeBinaryInputStream(largeBinary)
+    try {
+      f(stream)
+    } finally {
+      stream.close()
+    }
+  }
+
+  private def assertThrowsIOExceptionWhenClosed(operation: LargeBinaryInputStream => Unit): Unit = {
+    val largeBinary = createTestObject(s"test/closed-${Random.nextInt()}.txt", "data")
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.close()
+    val exception = intercept[IOException](operation(stream))
+    assert(exception.getMessage.contains("Stream is closed"))
+  }
+
+  // Constructor Tests
+  test("constructor should reject null LargeBinary") {
+    val exception = intercept[IllegalArgumentException] {
+      new LargeBinaryInputStream(null)
+    }
+    assert(exception.getMessage.contains("LargeBinary cannot be null"))
+  }
+
+  test("constructor should accept valid LargeBinary") {
+    val largeBinary = createTestObject("test/valid.txt", "test data")
+    withStream(largeBinary) { _ => }
+  }
+
+  // read() Tests
+  test("read() should read single bytes correctly") {
+    val largeBinary = createTestObject("test/single-byte.txt", "Hello")
+    withStream(largeBinary) { stream =>
+      assert(stream.read() == 'H'.toByte)
+      assert(stream.read() == 'e'.toByte)
+      assert(stream.read() == 'l'.toByte)
+      assert(stream.read() == 'l'.toByte)
+      assert(stream.read() == 'o'.toByte)
+      assert(stream.read() == -1) // EOF
+    }
+  }
+
+  test("read() should return -1 for empty object") {
+    val largeBinary = createTestObject("test/empty.txt", "")
+    withStream(largeBinary) { stream =>
+      assert(stream.read() == -1)
+    }
+  }
+
+  // read(byte[], int, int) Tests
+  test("read(byte[], int, int) should read data into buffer") {
+    val testData = "Hello, World!"
+    val largeBinary = createTestObject("test/buffer-read.txt", testData)
+    withStream(largeBinary) { stream =>
+      val buffer = new Array[Byte](testData.length)
+      val bytesRead = stream.read(buffer, 0, buffer.length)
+      assert(bytesRead == testData.length)
+      assert(new String(buffer) == testData)
+    }
+  }
+
+  test("read(byte[], int, int) should handle partial reads and offsets") {
+    val testData = "Hello, World!"
+    val largeBinary = createTestObject("test/partial.txt", testData)
+    withStream(largeBinary) { stream =>
+      // Test partial read
+      val buffer1 = new Array[Byte](5)
+      assert(stream.read(buffer1, 0, 5) == 5)
+      assert(new String(buffer1) == "Hello")
+    }
+
+    // Test offset
+    withStream(largeBinary) { stream =>
+      val buffer2 = new Array[Byte](20)
+      assert(stream.read(buffer2, 5, 10) == 10)
+      assert(new String(buffer2, 5, 10) == "Hello, Wor")
+    }
+  }
+
+  test("read(byte[], int, int) should return -1 at EOF") {
+    val largeBinary = createTestObject("test/eof.txt", "test")
+    withStream(largeBinary) { stream =>
+      val buffer = new Array[Byte](10)
+      stream.read(buffer, 0, 10)
+      assert(stream.read(buffer, 0, 10) == -1)
+    }
+  }
+
+  // readAllBytes() Tests
+  test("readAllBytes() should read entire object") {
+    val testData = "Hello, World! This is a test."
+    val largeBinary = createTestObject("test/read-all.txt", testData)
+    withStream(largeBinary) { stream =>
+      assert(new String(stream.readAllBytes()) == testData)
+    }
+  }
+
+  test("readAllBytes() should handle large objects") {
+    val largeData = generateRandomData(1024 * 1024) // 1MB
+    val largeBinary = createTestObject("test/large.bin", largeData)
+    withStream(largeBinary) { stream =>
+      val bytes = stream.readAllBytes()
+      assert(bytes.length == largeData.length)
+      assert(bytes.sameElements(largeData))
+    }
+  }
+
+  test("readAllBytes() should return empty array for empty object") {
+    val largeBinary = createTestObject("test/empty-all.txt", "")
+    withStream(largeBinary) { stream =>
+      assert(stream.readAllBytes().length == 0)
+    }
+  }
+
+  // readNBytes() Tests
+  test("readNBytes() should read exactly N bytes") {
+    val testData = "Hello, World! This is a test."
+    val largeBinary = createTestObject("test/read-n.txt", testData)
+    withStream(largeBinary) { stream =>
+      val bytes = stream.readNBytes(5)
+      assert(bytes.length == 5)
+      assert(new String(bytes) == "Hello")
+    }
+  }
+
+  test("readNBytes() should handle EOF and zero") {
+    val largeBinary = createTestObject("test/read-n-eof.txt", "Hello")
+    withStream(largeBinary) { stream =>
+      // Request more than available
+      val bytes = stream.readNBytes(100)
+      assert(bytes.length == 5)
+      assert(new String(bytes) == "Hello")
+    }
+
+    // Test n=0
+    withStream(largeBinary) { stream =>
+      assert(stream.readNBytes(0).length == 0)
+    }
+  }
+
+  // skip() Tests
+  test("skip() should skip bytes correctly") {
+    val largeBinary = createTestObject("test/skip.txt", "Hello, World!")
+    withStream(largeBinary) { stream =>
+      assert(stream.skip(7) == 7)
+      assert(stream.read() == 'W'.toByte)
+    }
+  }
+
+  test("skip() should handle EOF and zero") {
+    val largeBinary = createTestObject("test/skip-eof.txt", "Hello")
+    withStream(largeBinary) { stream =>
+      assert(stream.skip(100) == 5)
+      assert(stream.read() == -1)
+    }
+
+    // Test n=0
+    withStream(largeBinary) { stream =>
+      assert(stream.skip(0) == 0)
+    }
+  }
+
+  // available() Tests
+  test("available() should return non-negative value") {
+    val largeBinary = createTestObject("test/available.txt", "Hello, World!")
+    withStream(largeBinary) { stream =>
+      assert(stream.available() >= 0)
+    }
+  }
+
+  // close() Tests
+  test("close() should be idempotent") {
+    val largeBinary = createTestObject("test/close-idempotent.txt", "data")
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.close()
+    stream.close() // Should not throw
+    stream.close() // Should not throw
+  }
+
+  test("close() should prevent further operations") {
+    val largeBinary = createTestObject("test/close-prevents.txt", "data")
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.close()
+
+    intercept[IOException] { stream.read() }
+    intercept[IOException] { stream.readAllBytes() }
+    intercept[IOException] { stream.readNBytes(10) }
+    intercept[IOException] { stream.skip(10) }
+    intercept[IOException] { stream.available() }
+  }
+
+  test("close() should work without reading (lazy initialization)") {
+    val largeBinary = createTestObject("test/close-lazy.txt", "data")
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.close() // Should not throw
+  }
+
+  // Closed stream tests - consolidated
+  test("operations should throw IOException when stream is closed") {
+    assertThrowsIOExceptionWhenClosed(_.read())
+    assertThrowsIOExceptionWhenClosed(_.read(new Array[Byte](10), 0, 10))
+    assertThrowsIOExceptionWhenClosed(_.readAllBytes())
+    assertThrowsIOExceptionWhenClosed(_.readNBytes(10))
+    assertThrowsIOExceptionWhenClosed(_.skip(10))
+    assertThrowsIOExceptionWhenClosed(_.available())
+    assertThrowsIOExceptionWhenClosed(_.mark(100))
+    assertThrowsIOExceptionWhenClosed(_.reset())
+  }
+
+  // mark/reset Tests
+  test("markSupported() should delegate to underlying stream") {
+    val largeBinary = createTestObject("test/mark.txt", "data")
+    withStream(largeBinary) { stream =>
+      val supported = stream.markSupported()
+      assert(!supported || supported) // Just verify it's callable
+    }
+  }
+
+  test("mark() and reset() should delegate to underlying stream") {
+    val largeBinary = createTestObject("test/mark-reset.txt", "data")
+    withStream(largeBinary) { stream =>
+      if (stream.markSupported()) {
+        stream.mark(100)
+        stream.read()
+        stream.reset()
+      }
+    // If not supported, methods should still be callable
+    }
+  }
+
+  // Lazy initialization Tests
+  test("lazy initialization should not download until first read") {
+    val largeBinary = createTestObject("test/lazy-init.txt", "data")
+    val stream = new LargeBinaryInputStream(largeBinary)
+    // Creating the stream should not trigger download
+    // Reading should trigger download
+    try {
+      assert(stream.read() == 'd'.toByte)
+    } finally {
+      stream.close()
+    }
+  }
+
+  // Integration Tests
+  test("should handle chunked reading of large objects") {
+    val largeData = generateRandomData(10 * 1024) // 10KB
+    val largeBinary = createTestObject("test/chunked.bin", largeData)
+    withStream(largeBinary) { stream =>
+      val buffer = new Array[Byte](1024)
+      val output = new java.io.ByteArrayOutputStream()
+      var bytesRead = 0
+
+      while ({
+        bytesRead = stream.read(buffer, 0, buffer.length)
+        bytesRead != -1
+      }) {
+        output.write(buffer, 0, bytesRead)
+      }
+
+      val result = output.toByteArray
+      assert(result.length == largeData.length)
+      assert(result.sameElements(largeData))
+    }
+  }
+
+  test("should handle multiple streams reading same object") {
+    val testData = "Shared data"
+    val largeBinary = createTestObject("test/shared.txt", testData)
+
+    val stream1 = new LargeBinaryInputStream(largeBinary)
+    val stream2 = new LargeBinaryInputStream(largeBinary)
+
+    try {
+      assert(new String(stream1.readAllBytes()) == testData)
+      assert(new String(stream2.readAllBytes()) == testData)
+    } finally {
+      stream1.close()
+      stream2.close()
+    }
+  }
+
+  test("should preserve binary data integrity") {
+    val binaryData = Array[Byte](0, 1, 2, 127, -128, -1, 50, 100)
+    val largeBinary = createTestObject("test/binary.bin", binaryData)
+    withStream(largeBinary) { stream =>
+      assert(stream.readAllBytes().sameElements(binaryData))
+    }
+  }
+}
diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryManagerSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryManagerSpec.scala
new file mode 100644
index 00000000000..77d142efeeb
--- /dev/null
+++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryManagerSpec.scala
@@ -0,0 +1,471 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import org.apache.texera.amber.core.tuple.LargeBinary
+import org.scalatest.funsuite.AnyFunSuite
+
+class LargeBinaryManagerSpec extends AnyFunSuite with S3StorageTestBase {
+
+  /** Creates a large binary from string data and returns it. */
+  private def createLargeBinary(data: String): LargeBinary = {
+    val largeBinary = new LargeBinary()
+    val out = new LargeBinaryOutputStream(largeBinary)
+    try {
+      out.write(data.getBytes)
+    } finally {
+      out.close()
+    }
+    largeBinary
+  }
+
+  /** Verifies standard bucket name. */
+  private def assertStandardBucket(pointer: LargeBinary): Unit = {
+    assert(pointer.getBucketName == "texera-large-binaries")
+    assert(pointer.getUri.startsWith("s3://texera-large-binaries/"))
+  }
+
+  // ========================================
+  // LargeBinaryInputStream Tests (Standard Java InputStream)
+  // ========================================
+
+  test("LargeBinaryInputStream should read all bytes from stream") {
+    val data = "Hello, World! This is a test."
+    val largeBinary = createLargeBinary(data)
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    assert(stream.readAllBytes().sameElements(data.getBytes))
+    stream.close()
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should read exact number of bytes") {
+    val largeBinary = createLargeBinary("0123456789ABCDEF")
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    val result = stream.readNBytes(10)
+
+    assert(result.length == 10)
+    assert(result.sameElements("0123456789".getBytes))
+    stream.close()
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should handle reading more bytes than available") {
+    val data = "Short"
+    val largeBinary = createLargeBinary(data)
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    val result = stream.readNBytes(100)
+
+    assert(result.length == data.length)
+    assert(result.sameElements(data.getBytes))
+    stream.close()
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should support standard single-byte read") {
+    val largeBinary = createLargeBinary("ABC")
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    assert(stream.read() == 65) // 'A'
+    assert(stream.read() == 66) // 'B'
+    assert(stream.read() == 67) // 'C'
+    assert(stream.read() == -1) // EOF
+    stream.close()
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should return -1 at EOF") {
+    val largeBinary = createLargeBinary("EOF")
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.readAllBytes() // Read all data
+    assert(stream.read() == -1)
+    stream.close()
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should throw exception when reading from closed stream") {
+    val largeBinary = createLargeBinary("test")
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.close()
+
+    assertThrows[java.io.IOException](stream.read())
+    assertThrows[java.io.IOException](stream.readAllBytes())
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should handle multiple close calls") {
+    val largeBinary = createLargeBinary("test")
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    stream.close()
+    stream.close() // Should not throw
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should read large data correctly") {
+    val largeData = Array.fill[Byte](20000)((scala.util.Random.nextInt(256) - 128).toByte)
+    val largeBinary = new LargeBinary()
+    val out = new LargeBinaryOutputStream(largeBinary)
+    try {
+      out.write(largeData)
+    } finally {
+      out.close()
+    }
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    val result = stream.readAllBytes()
+    assert(result.sameElements(largeData))
+    stream.close()
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  // ========================================
+  // LargeBinaryManager Tests
+  // ========================================
+
+  test("LargeBinaryManager should create a large binary") {
+    val pointer = createLargeBinary("Test large binary data")
+
+    assertStandardBucket(pointer)
+  }
+
+  test("LargeBinaryInputStream should open and read a large binary") {
+    val data = "Hello from large binary!"
+    val pointer = createLargeBinary(data)
+
+    val stream = new LargeBinaryInputStream(pointer)
+    val readData = stream.readAllBytes()
+    stream.close()
+
+    assert(readData.sameElements(data.getBytes))
+  }
+
+  test("LargeBinaryInputStream should fail to open non-existent large binary") {
+    val fakeLargeBinary = new LargeBinary("s3://texera-large-binaries/nonexistent/file")
+    val stream = new LargeBinaryInputStream(fakeLargeBinary)
+
+    try {
+      intercept[Exception] {
+        stream.read()
+      }
+    } finally {
+      try { stream.close() }
+      catch { case _: Exception => }
+    }
+  }
+
+  test("LargeBinaryManager should delete all large binaries") {
+    val pointer1 = new LargeBinary()
+    val out1 = new LargeBinaryOutputStream(pointer1)
+    try {
+      out1.write("Object 1".getBytes)
+    } finally {
+      out1.close()
+    }
+
+    val pointer2 = new LargeBinary()
+    val out2 = new LargeBinaryOutputStream(pointer2)
+    try {
+      out2.write("Object 2".getBytes)
+    } finally {
+      out2.close()
+    }
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryManager should handle delete with no objects gracefully") {
+    LargeBinaryManager.deleteAllObjects() // Should not throw exception
+  }
+
+  test("LargeBinaryManager should delete all objects") {
+    val pointer1 = createLargeBinary("Test data")
+    val pointer2 = createLargeBinary("Test data")
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryManager should create bucket if it doesn't exist") {
+    val pointer = createLargeBinary("Test bucket creation")
+
+    assertStandardBucket(pointer)
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryManager should handle large objects correctly") {
+    val largeData = Array.fill[Byte](6 * 1024 * 1024)((scala.util.Random.nextInt(256) - 128).toByte)
+    val pointer = new LargeBinary()
+    val out = new LargeBinaryOutputStream(pointer)
+    try {
+      out.write(largeData)
+    } finally {
+      out.close()
+    }
+
+    val stream = new LargeBinaryInputStream(pointer)
+    val readData = stream.readAllBytes()
+    stream.close()
+
+    assert(readData.sameElements(largeData))
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryManager should generate unique URIs for different objects") {
+    val testData = "Unique URI test".getBytes
+    val pointer1 = new LargeBinary()
+    val out1 = new LargeBinaryOutputStream(pointer1)
+    try {
+      out1.write(testData)
+    } finally {
+      out1.close()
+    }
+
+    val pointer2 = new LargeBinary()
+    val out2 = new LargeBinaryOutputStream(pointer2)
+    try {
+      out2.write(testData)
+    } finally {
+      out2.close()
+    }
+
+    assert(pointer1.getUri != pointer2.getUri)
+    assert(pointer1.getObjectKey != pointer2.getObjectKey)
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream should handle multiple reads from the same large binary") {
+    val data = "Multiple reads test data"
+    val pointer = createLargeBinary(data)
+
+    val stream1 = new LargeBinaryInputStream(pointer)
+    val readData1 = stream1.readAllBytes()
+    stream1.close()
+
+    val stream2 = new LargeBinaryInputStream(pointer)
+    val readData2 = stream2.readAllBytes()
+    stream2.close()
+
+    assert(readData1.sameElements(data.getBytes))
+    assert(readData2.sameElements(data.getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryManager should properly parse bucket name and object key from large binary") {
+    val largeBinary = createLargeBinary("URI parsing test")
+
+    assertStandardBucket(largeBinary)
+    assert(largeBinary.getObjectKey.nonEmpty)
+    assert(!largeBinary.getObjectKey.startsWith("/"))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  // ========================================
+  // Object-Oriented API Tests
+  // ========================================
+
+  test("LargeBinary with LargeBinaryOutputStream should create a large binary") {
+    val data = "Test data for LargeBinary with LargeBinaryOutputStream"
+
+    val largeBinary = new LargeBinary()
+    val out = new LargeBinaryOutputStream(largeBinary)
+    try {
+      out.write(data.getBytes)
+    } finally {
+      out.close()
+    }
+
+    assertStandardBucket(largeBinary)
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryInputStream constructor should read large binary contents") {
+    val data = "Test data for LargeBinaryInputStream constructor"
+    val largeBinary = createLargeBinary(data)
+
+    val stream = new LargeBinaryInputStream(largeBinary)
+    val readData = stream.readAllBytes()
+    stream.close()
+
+    assert(readData.sameElements(data.getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryOutputStream and LargeBinaryInputStream should work together end-to-end") {
+    val data = "End-to-end test data"
+
+    // Create using streaming API
+    val largeBinary = new LargeBinary()
+    val out = new LargeBinaryOutputStream(largeBinary)
+    try {
+      out.write(data.getBytes)
+    } finally {
+      out.close()
+    }
+
+    // Read using standard constructor
+    val stream = new LargeBinaryInputStream(largeBinary)
+    val readData = stream.readAllBytes()
+    stream.close()
+
+    assert(readData.sameElements(data.getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  // ========================================
+  // LargeBinaryOutputStream Tests (New Symmetric API)
+  // ========================================
+
+  test("LargeBinaryOutputStream should write and upload data to S3") {
+    val data = "Test data for LargeBinaryOutputStream"
+
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write(data.getBytes)
+    outStream.close()
+
+    assertStandardBucket(largeBinary)
+
+    // Verify data can be read back
+    val inStream = new LargeBinaryInputStream(largeBinary)
+    val readData = inStream.readAllBytes()
+    inStream.close()
+
+    assert(readData.sameElements(data.getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryOutputStream should create large binary") {
+    val data = "Database registration test"
+
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write(data.getBytes)
+    outStream.close()
+
+    assertStandardBucket(largeBinary)
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryOutputStream should handle large data correctly") {
+    val largeData = Array.fill[Byte](8 * 1024 * 1024)((scala.util.Random.nextInt(256) - 128).toByte)
+
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write(largeData)
+    outStream.close()
+
+    // Verify data integrity
+    val inStream = new LargeBinaryInputStream(largeBinary)
+    val readData = inStream.readAllBytes()
+    inStream.close()
+
+    assert(readData.sameElements(largeData))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryOutputStream should handle multiple writes") {
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write("Hello ".getBytes)
+    outStream.write("World".getBytes)
+    outStream.write("!".getBytes)
+    outStream.close()
+
+    val inStream = new LargeBinaryInputStream(largeBinary)
+    val readData = inStream.readAllBytes()
+    inStream.close()
+
+    assert(readData.sameElements("Hello World!".getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryOutputStream should throw exception when writing to closed stream") {
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write("test".getBytes)
+    outStream.close()
+
+    assertThrows[java.io.IOException](outStream.write("more".getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinaryOutputStream should handle close() being called multiple times") {
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write("test".getBytes)
+    outStream.close()
+    outStream.close() // Should not throw
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("New LargeBinary() constructor should create unique URIs") {
+    val largeBinary1 = new LargeBinary()
+    val largeBinary2 = new LargeBinary()
+
+    assert(largeBinary1.getUri != largeBinary2.getUri)
+    assert(largeBinary1.getObjectKey != largeBinary2.getObjectKey)
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+
+  test("LargeBinary() and LargeBinaryOutputStream API should be symmetric with input") {
+    val data = "Symmetric API test"
+
+    // Write using new symmetric API
+    val largeBinary = new LargeBinary()
+    val outStream = new LargeBinaryOutputStream(largeBinary)
+    outStream.write(data.getBytes)
+    outStream.close()
+
+    // Read using symmetric API
+    val inStream = new LargeBinaryInputStream(largeBinary)
+    val readData = inStream.readAllBytes()
+    inStream.close()
+
+    assert(readData.sameElements(data.getBytes))
+
+    LargeBinaryManager.deleteAllObjects()
+  }
+}
diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryOutputStreamSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryOutputStreamSpec.scala
new file mode 100644
index 00000000000..ed2a2fbace7
--- /dev/null
+++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/LargeBinaryOutputStreamSpec.scala
@@ -0,0 +1,252 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import org.apache.texera.amber.core.tuple.LargeBinary
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.scalatest.funsuite.AnyFunSuite
+
+import java.io.IOException
+import scala.util.Random
+
+class LargeBinaryOutputStreamSpec
+    extends AnyFunSuite
+    with S3StorageTestBase
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach {
+
+  private val testBucketName = "test-large-binary-output-stream"
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    S3StorageClient.createBucketIfNotExist(testBucketName)
+  }
+
+  override def afterAll(): Unit = {
+    try {
+      S3StorageClient.deleteDirectory(testBucketName, "")
+    } catch {
+      case _: Exception => // Ignore cleanup errors
+    }
+    super.afterAll()
+  }
+
+  // Helper methods
+  private def createLargeBinary(key: String): LargeBinary =
+    new LargeBinary(s"s3://$testBucketName/$key")
+
+  private def generateRandomData(size: Int): Array[Byte] =
+    Array.fill[Byte](size)((Random.nextInt(256) - 128).toByte)
+
+  private def withStream[T](largeBinary: LargeBinary)(f: LargeBinaryOutputStream => T): T = {
+    val stream = new LargeBinaryOutputStream(largeBinary)
+    try f(stream)
+    finally stream.close()
+  }
+
+  private def readBack(largeBinary: LargeBinary): Array[Byte] = {
+    val inputStream = new LargeBinaryInputStream(largeBinary)
+    try inputStream.readAllBytes()
+    finally inputStream.close()
+  }
+
+  private def writeAndVerify(key: String, data: Array[Byte]): Unit = {
+    val largeBinary = createLargeBinary(key)
+    withStream(largeBinary)(_.write(data, 0, data.length))
+    assert(readBack(largeBinary).sameElements(data))
+  }
+
+  // === Constructor Tests ===
+  test("should reject null LargeBinary") {
+    val exception = intercept[IllegalArgumentException](new LargeBinaryOutputStream(null))
+    assert(exception.getMessage.contains("LargeBinary cannot be null"))
+  }
+
+  // === Basic Write Tests ===
+  test("should write single bytes correctly") {
+    val largeBinary = createLargeBinary("test/single-bytes.txt")
+    withStream(largeBinary) { stream =>
+      "Hello".foreach(c => stream.write(c.toByte))
+    }
+    assert(new String(readBack(largeBinary)) == "Hello")
+  }
+
+  test("should write byte arrays correctly") {
+    val testData = "Hello, World!".getBytes
+    writeAndVerify("test/array-write.txt", testData)
+  }
+
+  test("should handle partial writes with offset and length") {
+    val testData = "Hello, World!".getBytes
+    val largeBinary = createLargeBinary("test/partial-write.txt")
+
+    withStream(largeBinary) { stream =>
+      stream.write(testData, 0, 5) // "Hello"
+      stream.write(testData, 7, 5) // "World"
+    }
+
+    assert(new String(readBack(largeBinary)) == "HelloWorld")
+  }
+
+  test("should handle multiple consecutive writes") {
+    val largeBinary = createLargeBinary("test/multiple-writes.txt")
+    withStream(largeBinary) { stream =>
+      stream.write("Hello".getBytes)
+      stream.write(", ".getBytes)
+      stream.write("World!".getBytes)
+    }
+    assert(new String(readBack(largeBinary)) == "Hello, World!")
+  }
+
+  // === Stream Lifecycle Tests ===
+  test("flush should not throw") {
+    val largeBinary = createLargeBinary("test/flush.txt")
+    withStream(largeBinary) { stream =>
+      stream.write("test".getBytes)
+      stream.flush()
+      stream.write(" data".getBytes)
+    }
+    assert(new String(readBack(largeBinary)) == "test data")
+  }
+
+  test("close should be idempotent") {
+    val largeBinary = createLargeBinary("test/close-idempotent.txt")
+    val stream = new LargeBinaryOutputStream(largeBinary)
+    stream.write("data".getBytes)
+    stream.close()
+    stream.close() // Should not throw
+    stream.flush() // Should not throw after close
+    assert(new String(readBack(largeBinary)) == "data")
+  }
+
+  test("close should handle empty stream") {
+    val largeBinary = createLargeBinary("test/empty-stream.txt")
+    val stream = new LargeBinaryOutputStream(largeBinary)
+    stream.close()
+    assert(readBack(largeBinary).length == 0)
+  }
+
+  // === Error Handling ===
+  test("write operations should throw IOException when stream is closed") {
+    val largeBinary = createLargeBinary("test/closed-stream.txt")
+    val stream = new LargeBinaryOutputStream(largeBinary)
+    stream.close()
+
+    val ex1 = intercept[IOException](stream.write('A'.toByte))
+    assert(ex1.getMessage.contains("Stream is closed"))
+
+    val ex2 = intercept[IOException](stream.write("test".getBytes))
+    assert(ex2.getMessage.contains("Stream is closed"))
+  }
+
+  // === Large Data Tests ===
+  test("should handle large data (1MB)") {
+    val largeData = generateRandomData(1024 * 1024)
+    writeAndVerify("test/large-1mb.bin", largeData)
+  }
+
+  test("should handle very large data (10MB)") {
+    val veryLargeData = generateRandomData(10 * 1024 * 1024)
+    writeAndVerify("test/large-10mb.bin", veryLargeData)
+  }
+
+  test("should handle chunked writes") {
+    val totalSize = 1024 * 1024 // 1MB
+    val chunkSize = 8 * 1024 // 8KB
+    val data = generateRandomData(totalSize)
+    val largeBinary = createLargeBinary("test/chunked.bin")
+
+    withStream(largeBinary) { stream =>
+      data.grouped(chunkSize).foreach(chunk => stream.write(chunk))
+    }
+
+    assert(readBack(largeBinary).sameElements(data))
+  }
+
+  // === Binary Data Tests ===
+  test("should preserve all byte values (0-255)") {
+    val allBytes = (0 until 256).map(_.toByte).toArray
+    writeAndVerify("test/all-bytes.bin", allBytes)
+  }
+
+  // === Integration Tests ===
+  test("should handle concurrent writes to different objects") {
+    val streams = (1 to 3).map { i =>
+      val obj = createLargeBinary(s"test/concurrent-$i.txt")
+      val stream = new LargeBinaryOutputStream(obj)
+      (obj, stream, s"Data $i")
+    }
+
+    try {
+      streams.foreach { case (_, stream, data) => stream.write(data.getBytes) }
+    } finally {
+      streams.foreach(_._2.close())
+    }
+
+    streams.foreach {
+      case (obj, _, expected) =>
+        assert(new String(readBack(obj)) == expected)
+    }
+  }
+
+  test("should overwrite existing object") {
+    val largeBinary = createLargeBinary("test/overwrite.txt")
+    withStream(largeBinary)(_.write("original data".getBytes))
+    withStream(largeBinary)(_.write("new data".getBytes))
+    assert(new String(readBack(largeBinary)) == "new data")
+  }
+
+  test("should handle mixed write operations") {
+    val largeBinary = createLargeBinary("test/mixed-writes.txt")
+    withStream(largeBinary) { stream =>
+      stream.write('A'.toByte)
+      stream.write(" test ".getBytes)
+      stream.write('B'.toByte)
+      val data = "Hello, World!".getBytes
+      stream.write(data, 7, 6) // "World!"
+    }
+    assert(new String(readBack(largeBinary)) == "A test BWorld!")
+  }
+
+  // === Edge Cases ===
+  test("should create bucket automatically") {
+    val newBucketName = s"new-bucket-${Random.nextInt(10000)}"
+    val largeBinary = new LargeBinary(s"s3://$newBucketName/test/auto-create.txt")
+
+    try {
+      withStream(largeBinary)(_.write("test".getBytes))
+      assert(new String(readBack(largeBinary)) == "test")
+    } finally {
+      try S3StorageClient.deleteDirectory(newBucketName, "")
+      catch { case _: Exception => /* ignore */ }
+    }
+  }
+
+  test("should handle rapid open/close cycles") {
+    (1 to 10).foreach { i =>
+      withStream(createLargeBinary(s"test/rapid-$i.txt"))(_.write(s"data-$i".getBytes))
+    }
+
+    (1 to 10).foreach { i =>
+      val result = readBack(createLargeBinary(s"test/rapid-$i.txt"))
+      assert(new String(result) == s"data-$i")
+    }
+  }
+}
diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageClientSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageClientSpec.scala
new file mode 100644
index 00000000000..a1662cf8c3f
--- /dev/null
+++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageClientSpec.scala
@@ -0,0 +1,337 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.scalatest.funsuite.AnyFunSuite
+
+import java.io.ByteArrayInputStream
+import scala.util.Random
+
+class S3StorageClientSpec
+    extends AnyFunSuite
+    with S3StorageTestBase
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach {
+
+  private val testBucketName = "test-s3-storage-client"
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    S3StorageClient.createBucketIfNotExist(testBucketName)
+  }
+
+  override def afterAll(): Unit = {
+    // Clean up test bucket
+    try {
+      S3StorageClient.deleteDirectory(testBucketName, "")
+    } catch {
+      case _: Exception => // Ignore cleanup errors
+    }
+    super.afterAll()
+  }
+
+  // Helper methods
+  private def createInputStream(data: String): ByteArrayInputStream = {
+    new ByteArrayInputStream(data.getBytes)
+  }
+
+  private def createInputStream(data: Array[Byte]): ByteArrayInputStream = {
+    new ByteArrayInputStream(data)
+  }
+
+  private def readInputStream(inputStream: java.io.InputStream): Array[Byte] = {
+    val buffer = new Array[Byte](8192)
+    val outputStream = new java.io.ByteArrayOutputStream()
+    var bytesRead = 0
+    while ({
+      bytesRead = inputStream.read(buffer); bytesRead != -1
+    }) {
+      outputStream.write(buffer, 0, bytesRead)
+    }
+    outputStream.toByteArray
+  }
+
+  // ========================================
+  // uploadObject Tests
+  // ========================================
+
+  test("uploadObject should upload a small object successfully") {
+    val testData = "Hello, World! This is a small test object."
+    val objectKey = "test/small-object.txt"
+
+    val eTag = S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(testData))
+
+    assert(eTag != null)
+    assert(eTag.nonEmpty)
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("uploadObject should upload an empty object") {
+    val objectKey = "test/empty-object.txt"
+
+    val eTag = S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(""))
+
+    assert(eTag != null)
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("uploadObject should upload a large object using multipart upload") {
+    // Create data larger than MINIMUM_NUM_OF_MULTIPART_S3_PART (5MB)
+    val largeData = Array.fill[Byte](6 * 1024 * 1024)((Random.nextInt(256) - 128).toByte)
+    val objectKey = "test/large-object.bin"
+
+    val eTag = S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(largeData))
+
+    assert(eTag != null)
+    assert(eTag.nonEmpty)
+
+    // Verify the uploaded content
+    val downloadedStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = readInputStream(downloadedStream)
+    downloadedStream.close()
+
+    assert(downloadedData.length == largeData.length)
+    assert(downloadedData.sameElements(largeData))
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("uploadObject should handle objects with special characters in key") {
+    val testData = "Testing special characters"
+    val objectKey = "test/special-chars/file with spaces & symbols!@#.txt"
+
+    val eTag = S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(testData))
+
+    assert(eTag != null)
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("uploadObject should overwrite existing object") {
+    val objectKey = "test/overwrite-test.txt"
+    val data1 = "Original data"
+    val data2 = "Updated data"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(data1))
+    val eTag2 = S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(data2))
+
+    assert(eTag2 != null)
+
+    val downloadedStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = new String(readInputStream(downloadedStream))
+    downloadedStream.close()
+
+    assert(downloadedData == data2)
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  // ========================================
+  // downloadObject Tests
+  // ========================================
+
+  test("downloadObject should download an object successfully") {
+    val testData = "This is test data for download."
+    val objectKey = "test/download-test.txt"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(testData))
+
+    val inputStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = new String(readInputStream(inputStream))
+    inputStream.close()
+
+    assert(downloadedData == testData)
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("downloadObject should download large objects correctly") {
+    val largeData = Array.fill[Byte](10 * 1024 * 1024)((Random.nextInt(256) - 128).toByte)
+    val objectKey = "test/large-download-test.bin"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(largeData))
+
+    val inputStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = readInputStream(inputStream)
+    inputStream.close()
+
+    assert(downloadedData.length == largeData.length)
+    assert(downloadedData.sameElements(largeData))
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("downloadObject should download empty objects") {
+    val objectKey = "test/empty-download-test.txt"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(""))
+
+    val inputStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = readInputStream(inputStream)
+    inputStream.close()
+
+    assert(downloadedData.isEmpty)
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("downloadObject should throw exception for non-existent object") {
+    val nonExistentKey = "test/non-existent-object.txt"
+
+    assertThrows[Exception] {
+      S3StorageClient.downloadObject(testBucketName, nonExistentKey)
+    }
+  }
+
+  test("downloadObject should handle binary data correctly") {
+    val binaryData = Array[Byte](0, 1, 2, 127, -128, -1, 64, 32, 16, 8, 4, 2, 1)
+    val objectKey = "test/binary-data.bin"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(binaryData))
+
+    val inputStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = readInputStream(inputStream)
+    inputStream.close()
+
+    assert(downloadedData.sameElements(binaryData))
+
+    // Clean up
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  // ========================================
+  // deleteObject Tests
+  // ========================================
+
+  test("deleteObject should delete an existing object") {
+    val objectKey = "test/delete-test.txt"
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream("delete me"))
+
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+
+    // Verify deletion by attempting to download
+    assertThrows[Exception] {
+      S3StorageClient.downloadObject(testBucketName, objectKey)
+    }
+  }
+
+  test("deleteObject should not throw exception for non-existent object") {
+    val nonExistentKey = "test/already-deleted.txt"
+
+    // Should not throw exception
+    S3StorageClient.deleteObject(testBucketName, nonExistentKey)
+  }
+
+  test("deleteObject should delete large objects") {
+    val largeData = Array.fill[Byte](7 * 1024 * 1024)((Random.nextInt(256) - 128).toByte)
+    val objectKey = "test/large-delete-test.bin"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(largeData))
+
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+
+    // Verify deletion by attempting to download
+    assertThrows[Exception] {
+      S3StorageClient.downloadObject(testBucketName, objectKey)
+    }
+  }
+
+  test("deleteObject should handle multiple deletions of the same object") {
+    val objectKey = "test/multi-delete-test.txt"
+    S3StorageClient.uploadObject(
+      testBucketName,
+      objectKey,
+      createInputStream("delete multiple times")
+    )
+
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+
+    // Second delete should not throw exception
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  // ========================================
+  // Integration Tests (combining methods)
+  // ========================================
+
+  test("upload, download, and delete workflow should work correctly") {
+    val testData = "Complete workflow test data"
+    val objectKey = "test/workflow-test.txt"
+
+    // Upload
+    val eTag = S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(testData))
+    assert(eTag != null)
+
+    // Download
+    val inputStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = new String(readInputStream(inputStream))
+    inputStream.close()
+    assert(downloadedData == testData)
+
+    // Delete
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+
+  test("multiple objects can be managed independently") {
+    val objects = Map(
+      "test/object1.txt" -> "Data for object 1",
+      "test/object2.txt" -> "Data for object 2",
+      "test/object3.txt" -> "Data for object 3"
+    )
+
+    // Upload all objects
+    objects.foreach {
+      case (key, data) =>
+        S3StorageClient.uploadObject(testBucketName, key, createInputStream(data))
+    }
+
+    // Delete one object
+    S3StorageClient.deleteObject(testBucketName, "test/object2.txt")
+
+    // Clean up remaining objects
+    S3StorageClient.deleteObject(testBucketName, "test/object1.txt")
+    S3StorageClient.deleteObject(testBucketName, "test/object3.txt")
+  }
+
+  test("objects with nested paths should be handled correctly") {
+    val objectKey = "test/deeply/nested/path/to/object.txt"
+    val testData = "Nested path test"
+
+    S3StorageClient.uploadObject(testBucketName, objectKey, createInputStream(testData))
+
+    val inputStream = S3StorageClient.downloadObject(testBucketName, objectKey)
+    val downloadedData = new String(readInputStream(inputStream))
+    inputStream.close()
+    assert(downloadedData == testData)
+
+    S3StorageClient.deleteObject(testBucketName, objectKey)
+  }
+}
diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala
new file mode 100644
index 00000000000..1d3b77dbb16
--- /dev/null
+++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.util
+
+import com.dimafeng.testcontainers.MinIOContainer
+import org.apache.texera.amber.config.StorageConfig
+import org.scalatest.{BeforeAndAfterAll, Suite}
+import org.testcontainers.utility.DockerImageName
+
+/**
+  * Base trait for tests requiring S3 storage (MinIO).
+  * Provides access to a single shared MinIO container across all test suites.
+  *
+  * Usage: Mix this trait into any test suite that needs S3 storage.
+  */
+trait S3StorageTestBase extends BeforeAndAfterAll { this: Suite =>
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    // Trigger lazy initialization of shared container
+    S3StorageTestBase.ensureContainerStarted()
+  }
+}
+
+object S3StorageTestBase {
+  private lazy val container: MinIOContainer = {
+    val c = MinIOContainer(
+      dockerImageName = DockerImageName.parse("minio/minio:RELEASE.2025-02-28T09-55-16Z"),
+      userName = "texera_minio",
+      password = "password"
+    )
+    c.start()
+
+    val endpoint = s"http://${c.host}:${c.mappedPort(9000)}"
+    StorageConfig.s3Endpoint = endpoint
+
+    println(s"[S3Storage] Started shared MinIO at $endpoint")
+
+    sys.addShutdownHook {
+      println("[S3Storage] Stopping shared MinIO...")
+      c.stop()
+    }
+
+    c
+  }
+
+  /** Ensures the container is started (triggers lazy initialization). */
+  def ensureContainerStarted(): Unit = {
+    container // Access lazy val to trigger initialization
+    ()
+  }
+}
diff --git a/core/workflow-operator/build.sbt b/common/workflow-operator/build.sbt
similarity index 99%
rename from core/workflow-operator/build.sbt
rename to common/workflow-operator/build.sbt
index 4c6f86a1f6d..9f7f5b22a47 100644
--- a/core/workflow-operator/build.sbt
+++ b/common/workflow-operator/build.sbt
@@ -21,7 +21,7 @@ import scala.collection.Seq
 /////////////////////////////////////////////////////////////////////////////
 
 name := "workflow-operator"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
diff --git a/core/workflow-operator/project/build.properties b/common/workflow-operator/project/build.properties
similarity index 100%
rename from core/workflow-operator/project/build.properties
rename to common/workflow-operator/project/build.properties
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaDraft.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaDraft.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaDraft.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaDraft.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala
similarity index 99%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala
index d2ed75b30ff..69bf1c11963 100644
--- a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala
+++ b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala
@@ -28,15 +28,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors._
 import com.fasterxml.jackson.databind.jsontype.impl.MinimalClassNameIdResolver
 import com.fasterxml.jackson.databind.node.{ArrayNode, JsonNodeFactory, ObjectNode}
 import com.fasterxml.jackson.databind.util.ClassUtil
-import com.kjetland.jackson.jsonSchema.annotations.{
-  JsonSchemaDefault,
-  JsonSchemaDescription,
-  JsonSchemaExamples,
-  JsonSchemaFormat,
-  JsonSchemaInject,
-  JsonSchemaOptions,
-  JsonSchemaTitle
-}
+import com.kjetland.jackson.jsonSchema.annotations._
 import io.github.classgraph.{ClassGraph, ScanResult}
 import org.slf4j.LoggerFactory
 
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaArrayWithUniqueItems.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaArrayWithUniqueItems.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaArrayWithUniqueItems.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaArrayWithUniqueItems.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaBool.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaBool.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaBool.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaBool.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDefault.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDefault.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDefault.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDefault.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDescription.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDescription.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDescription.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaDescription.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaExamples.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaExamples.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaExamples.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaExamples.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaFormat.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaFormat.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaFormat.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaFormat.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInject.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInject.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInject.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInject.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInt.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInt.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInt.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaInt.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaOptions.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaOptions.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaOptions.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaOptions.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaString.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaString.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaString.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaString.java
diff --git a/core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaTitle.java b/common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaTitle.java
similarity index 100%
rename from core/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaTitle.java
rename to common/workflow-operator/src/main/scala/com/kjetland/jackson/jsonSchema/annotations/JsonSchemaTitle.java
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/DummyProperties.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/DummyProperties.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/DummyProperties.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/DummyProperties.scala
index 3d8b6ddc063..b119c8f93e4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/DummyProperties.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/DummyProperties.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator
+package org.apache.texera.amber.operator
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/LogicalOp.scala
similarity index 69%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/LogicalOp.scala
index 790e463898c..eb319a82d1d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/LogicalOp.scala
@@ -17,149 +17,127 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator
+package org.apache.texera.amber.operator
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation._
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   OperatorIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity}
-import edu.uci.ics.amber.operator.aggregate.AggregateOpDesc
-import edu.uci.ics.amber.operator.cartesianProduct.CartesianProductOpDesc
-import edu.uci.ics.amber.operator.dictionary.DictionaryMatcherOpDesc
-import edu.uci.ics.amber.operator.difference.DifferenceOpDesc
-import edu.uci.ics.amber.operator.distinct.DistinctOpDesc
-import edu.uci.ics.amber.operator.dummy.DummyOpDesc
-import edu.uci.ics.amber.operator.filter.SpecializedFilterOpDesc
-import edu.uci.ics.amber.operator.hashJoin.HashJoinOpDesc
-import edu.uci.ics.amber.operator.huggingFace.{
+import org.apache.texera.amber.core.workflow.WorkflowContext.{
+  DEFAULT_EXECUTION_ID,
+  DEFAULT_WORKFLOW_ID
+}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity}
+import org.apache.texera.amber.operator.aggregate.AggregateOpDesc
+import org.apache.texera.amber.operator.cartesianProduct.CartesianProductOpDesc
+import org.apache.texera.amber.operator.dictionary.DictionaryMatcherOpDesc
+import org.apache.texera.amber.operator.difference.DifferenceOpDesc
+import org.apache.texera.amber.operator.distinct.DistinctOpDesc
+import org.apache.texera.amber.operator.dummy.DummyOpDesc
+import org.apache.texera.amber.operator.filter.SpecializedFilterOpDesc
+import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc
+import org.apache.texera.amber.operator.huggingFace.{
   HuggingFaceIrisLogisticRegressionOpDesc,
   HuggingFaceSentimentAnalysisOpDesc,
   HuggingFaceSpamSMSDetectionOpDesc,
   HuggingFaceTextSummarizationOpDesc
 }
-import edu.uci.ics.amber.operator.ifStatement.IfOpDesc
-import edu.uci.ics.amber.operator.intersect.IntersectOpDesc
-import edu.uci.ics.amber.operator.intervalJoin.IntervalJoinOpDesc
-import edu.uci.ics.amber.operator.keywordSearch.KeywordSearchOpDesc
-import edu.uci.ics.amber.operator.limit.LimitOpDesc
-import edu.uci.ics.amber.operator.machineLearning.Scorer.MachineLearningScorerOpDesc
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer.{
+import org.apache.texera.amber.operator.ifStatement.IfOpDesc
+import org.apache.texera.amber.operator.intersect.IntersectOpDesc
+import org.apache.texera.amber.operator.intervalJoin.IntervalJoinOpDesc
+import org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpDesc
+import org.apache.texera.amber.operator.limit.LimitOpDesc
+import org.apache.texera.amber.operator.machineLearning.Scorer.MachineLearningScorerOpDesc
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer.{
   SklearnAdvancedKNNClassifierTrainerOpDesc,
   SklearnAdvancedKNNRegressorTrainerOpDesc
 }
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer.SklearnAdvancedSVCTrainerOpDesc
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer.SklearnAdvancedSVRTrainerOpDesc
-import edu.uci.ics.amber.operator.metadata.{OPVersion, OperatorInfo, PropertyNameConstants}
-import edu.uci.ics.amber.operator.projection.ProjectionOpDesc
-import edu.uci.ics.amber.operator.randomksampling.RandomKSamplingOpDesc
-import edu.uci.ics.amber.operator.regex.RegexOpDesc
-import edu.uci.ics.amber.operator.reservoirsampling.ReservoirSamplingOpDesc
-import edu.uci.ics.amber.operator.sklearn._
-import edu.uci.ics.amber.operator.sleep.SleepOpDesc
-import edu.uci.ics.amber.operator.sklearn.training.{
-  SklearnTrainingAdaptiveBoostingOpDesc,
-  SklearnTrainingBaggingOpDesc,
-  SklearnTrainingBernoulliNaiveBayesOpDesc,
-  SklearnTrainingComplementNaiveBayesOpDesc,
-  SklearnTrainingDecisionTreeOpDesc,
-  SklearnTrainingDummyClassifierOpDesc,
-  SklearnTrainingExtraTreeOpDesc,
-  SklearnTrainingExtraTreesOpDesc,
-  SklearnTrainingGaussianNaiveBayesOpDesc,
-  SklearnTrainingGradientBoostingOpDesc,
-  SklearnTrainingKNNOpDesc,
-  SklearnTrainingLinearRegressionOpDesc,
-  SklearnTrainingLinearSVMOpDesc,
-  SklearnTrainingLogisticRegressionCVOpDesc,
-  SklearnTrainingLogisticRegressionOpDesc,
-  SklearnTrainingMultiLayerPerceptronOpDesc,
-  SklearnTrainingMultinomialNaiveBayesOpDesc,
-  SklearnTrainingNearestCentroidOpDesc,
-  SklearnTrainingPassiveAggressiveOpDesc,
-  SklearnTrainingPerceptronOpDesc,
-  SklearnTrainingProbabilityCalibrationOpDesc,
-  SklearnTrainingRandomForestOpDesc,
-  SklearnTrainingRidgeCVOpDesc,
-  SklearnTrainingRidgeOpDesc,
-  SklearnTrainingSDGOpDesc,
-  SklearnTrainingSVMOpDesc
-}
-import edu.uci.ics.amber.operator.sort.SortOpDesc
-import edu.uci.ics.amber.operator.sortPartitions.SortPartitionsOpDesc
-import edu.uci.ics.amber.operator.source.apis.reddit.RedditSearchSourceOpDesc
-import edu.uci.ics.amber.operator.source.apis.twitter.v2.{
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer.SklearnAdvancedSVCTrainerOpDesc
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer.SklearnAdvancedSVRTrainerOpDesc
+import org.apache.texera.amber.operator.metadata.{OPVersion, OperatorInfo, PropertyNameConstants}
+import org.apache.texera.amber.operator.projection.ProjectionOpDesc
+import org.apache.texera.amber.operator.randomksampling.RandomKSamplingOpDesc
+import org.apache.texera.amber.operator.regex.RegexOpDesc
+import org.apache.texera.amber.operator.reservoirsampling.ReservoirSamplingOpDesc
+import org.apache.texera.amber.operator.sklearn._
+import org.apache.texera.amber.operator.sklearn.training._
+import org.apache.texera.amber.operator.sleep.SleepOpDesc
+import org.apache.texera.amber.operator.sort.{SortOpDesc, StableMergeSortOpDesc}
+import org.apache.texera.amber.operator.sortPartitions.SortPartitionsOpDesc
+import org.apache.texera.amber.operator.source.apis.reddit.RedditSearchSourceOpDesc
+import org.apache.texera.amber.operator.source.apis.twitter.v2.{
   TwitterFullArchiveSearchSourceOpDesc,
   TwitterSearchSourceOpDesc
 }
-import edu.uci.ics.amber.operator.source.fetcher.URLFetcherOpDesc
-import edu.uci.ics.amber.operator.source.scan.FileScanSourceOpDesc
-import edu.uci.ics.amber.operator.source.scan.arrow.ArrowSourceOpDesc
-import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc
-import edu.uci.ics.amber.operator.source.scan.csvOld.CSVOldScanSourceOpDesc
-import edu.uci.ics.amber.operator.source.scan.json.JSONLScanSourceOpDesc
-import edu.uci.ics.amber.operator.source.scan.text.TextInputSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.mysql.MySQLSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.postgresql.PostgreSQLSourceOpDesc
-import edu.uci.ics.amber.operator.split.SplitOpDesc
-import edu.uci.ics.amber.operator.symmetricDifference.SymmetricDifferenceOpDesc
-import edu.uci.ics.amber.operator.typecasting.TypeCastingOpDesc
-import edu.uci.ics.amber.operator.udf.java.JavaUDFOpDesc
-import edu.uci.ics.amber.operator.udf.python._
-import edu.uci.ics.amber.operator.udf.python.source.PythonUDFSourceOpDescV2
-import edu.uci.ics.amber.operator.udf.r.{RUDFOpDesc, RUDFSourceOpDesc}
-import edu.uci.ics.amber.operator.union.UnionOpDesc
-import edu.uci.ics.amber.operator.unneststring.UnnestStringOpDesc
-import edu.uci.ics.amber.operator.visualization.DotPlot.DotPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.IcicleChart.IcicleChartOpDesc
-import edu.uci.ics.amber.operator.visualization.ImageViz.ImageVisualizerOpDesc
-import edu.uci.ics.amber.operator.visualization.ScatterMatrixChart.ScatterMatrixChartOpDesc
-import edu.uci.ics.amber.operator.visualization.barChart.BarChartOpDesc
-import edu.uci.ics.amber.operator.visualization.boxViolinPlot.BoxViolinPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.bubbleChart.BubbleChartOpDesc
-import edu.uci.ics.amber.operator.visualization.bulletChart.BulletChartOpDesc
-import edu.uci.ics.amber.operator.visualization.candlestickChart.CandlestickChartOpDesc
-import edu.uci.ics.amber.operator.visualization.choroplethMap.ChoroplethMapOpDesc
-import edu.uci.ics.amber.operator.visualization.continuousErrorBands.ContinuousErrorBandsOpDesc
-import edu.uci.ics.amber.operator.visualization.contourPlot.ContourPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.dumbbellPlot.DumbbellPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.figureFactoryTable.FigureFactoryTableOpDesc
-import edu.uci.ics.amber.operator.visualization.filledAreaPlot.FilledAreaPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.funnelPlot.FunnelPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.ganttChart.GanttChartOpDesc
-import edu.uci.ics.amber.operator.visualization.gaugeChart.GaugeChartOpDesc
-import edu.uci.ics.amber.operator.visualization.timeSeriesplot.TimeSeriesOpDesc
-import edu.uci.ics.amber.operator.visualization.heatMap.HeatMapOpDesc
-import edu.uci.ics.amber.operator.visualization.hierarchychart.HierarchyChartOpDesc
-import edu.uci.ics.amber.operator.visualization.histogram.HistogramChartOpDesc
-import edu.uci.ics.amber.operator.visualization.htmlviz.HtmlVizOpDesc
-import edu.uci.ics.amber.operator.visualization.lineChart.LineChartOpDesc
-import edu.uci.ics.amber.operator.visualization.networkGraph.NetworkGraphOpDesc
-import edu.uci.ics.amber.operator.visualization.pieChart.PieChartOpDesc
-import edu.uci.ics.amber.operator.visualization.quiverPlot.QuiverPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.rangeSlider.RangeSliderOpDesc
-import edu.uci.ics.amber.operator.visualization.sankeyDiagram.SankeyDiagramOpDesc
-import edu.uci.ics.amber.operator.visualization.scatter3DChart.Scatter3dChartOpDesc
-import edu.uci.ics.amber.operator.visualization.scatterplot.ScatterplotOpDesc
-import edu.uci.ics.amber.operator.visualization.tablesChart.TablesPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.ternaryPlot.TernaryPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.urlviz.UrlVizOpDesc
-import edu.uci.ics.amber.operator.visualization.volcanoPlot.VolcanoPlotOpDesc
-import edu.uci.ics.amber.operator.visualization.waterfallChart.WaterfallChartOpDesc
-import edu.uci.ics.amber.operator.visualization.wordCloud.WordCloudOpDesc
-import edu.uci.ics.amber.operator.visualization.dendrogram.DendrogramOpDesc
-import edu.uci.ics.amber.operator.visualization.histogram2d.Histogram2DOpDesc
-import edu.uci.ics.amber.operator.visualization.nestedTable.NestedTableOpDesc
-import edu.uci.ics.amber.operator.visualization.treeplot.TreePlotOpDesc
+import org.apache.texera.amber.operator.source.fetcher.URLFetcherOpDesc
+import org.apache.texera.amber.operator.source.scan.FileScanSourceOpDesc
+import org.apache.texera.amber.operator.source.scan.arrow.ArrowSourceOpDesc
+import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc
+import org.apache.texera.amber.operator.source.scan.csvOld.CSVOldScanSourceOpDesc
+import org.apache.texera.amber.operator.source.scan.json.JSONLScanSourceOpDesc
+import org.apache.texera.amber.operator.source.scan.text.TextInputSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.mysql.MySQLSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLSourceOpDesc
+import org.apache.texera.amber.operator.split.SplitOpDesc
+import org.apache.texera.amber.operator.substringSearch.SubstringSearchOpDesc
+import org.apache.texera.amber.operator.symmetricDifference.SymmetricDifferenceOpDesc
+import org.apache.texera.amber.operator.typecasting.TypeCastingOpDesc
+import org.apache.texera.amber.operator.udf.java.JavaUDFOpDesc
+import org.apache.texera.amber.operator.udf.python._
+import org.apache.texera.amber.operator.udf.python.source.PythonUDFSourceOpDescV2
+import org.apache.texera.amber.operator.udf.r.{RUDFOpDesc, RUDFSourceOpDesc}
+import org.apache.texera.amber.operator.union.UnionOpDesc
+import org.apache.texera.amber.operator.unneststring.UnnestStringOpDesc
+import org.apache.texera.amber.operator.visualization.DotPlot.DotPlotOpDesc
+import org.apache.texera.amber.operator.visualization.IcicleChart.IcicleChartOpDesc
+import org.apache.texera.amber.operator.visualization.ImageViz.ImageVisualizerOpDesc
+import org.apache.texera.amber.operator.visualization.ScatterMatrixChart.ScatterMatrixChartOpDesc
+import org.apache.texera.amber.operator.visualization.barChart.BarChartOpDesc
+import org.apache.texera.amber.operator.visualization.boxViolinPlot.BoxViolinPlotOpDesc
+import org.apache.texera.amber.operator.visualization.bubbleChart.BubbleChartOpDesc
+import org.apache.texera.amber.operator.visualization.bulletChart.BulletChartOpDesc
+import org.apache.texera.amber.operator.visualization.candlestickChart.CandlestickChartOpDesc
+import org.apache.texera.amber.operator.visualization.choroplethMap.ChoroplethMapOpDesc
+import org.apache.texera.amber.operator.visualization.continuousErrorBands.ContinuousErrorBandsOpDesc
+import org.apache.texera.amber.operator.visualization.contourPlot.ContourPlotOpDesc
+import org.apache.texera.amber.operator.visualization.dendrogram.DendrogramOpDesc
+import org.apache.texera.amber.operator.visualization.dumbbellPlot.DumbbellPlotOpDesc
+import org.apache.texera.amber.operator.visualization.figureFactoryTable.FigureFactoryTableOpDesc
+import org.apache.texera.amber.operator.visualization.filledAreaPlot.FilledAreaPlotOpDesc
+import org.apache.texera.amber.operator.visualization.funnelPlot.FunnelPlotOpDesc
+import org.apache.texera.amber.operator.visualization.ganttChart.GanttChartOpDesc
+import org.apache.texera.amber.operator.visualization.gaugeChart.GaugeChartOpDesc
+import org.apache.texera.amber.operator.visualization.heatMap.HeatMapOpDesc
+import org.apache.texera.amber.operator.visualization.hierarchychart.HierarchyChartOpDesc
+import org.apache.texera.amber.operator.visualization.histogram.HistogramChartOpDesc
+import org.apache.texera.amber.operator.visualization.histogram2d.Histogram2DOpDesc
+import org.apache.texera.amber.operator.visualization.htmlviz.HtmlVizOpDesc
+import org.apache.texera.amber.operator.visualization.lineChart.LineChartOpDesc
+import org.apache.texera.amber.operator.visualization.nestedTable.NestedTableOpDesc
+import org.apache.texera.amber.operator.visualization.networkGraph.NetworkGraphOpDesc
+import org.apache.texera.amber.operator.visualization.pieChart.PieChartOpDesc
+import org.apache.texera.amber.operator.visualization.quiverPlot.QuiverPlotOpDesc
+import org.apache.texera.amber.operator.visualization.rangeSlider.RangeSliderOpDesc
+import org.apache.texera.amber.operator.visualization.sankeyDiagram.SankeyDiagramOpDesc
+import org.apache.texera.amber.operator.visualization.scatter3DChart.Scatter3dChartOpDesc
+import org.apache.texera.amber.operator.visualization.scatterplot.ScatterplotOpDesc
+import org.apache.texera.amber.operator.visualization.tablesChart.TablesPlotOpDesc
+import org.apache.texera.amber.operator.visualization.ternaryPlot.TernaryPlotOpDesc
+import org.apache.texera.amber.operator.visualization.timeSeriesplot.TimeSeriesOpDesc
+import org.apache.texera.amber.operator.visualization.treeplot.TreePlotOpDesc
+import org.apache.texera.amber.operator.visualization.urlviz.UrlVizOpDesc
+import org.apache.texera.amber.operator.visualization.volcanoPlot.VolcanoPlotOpDesc
+import org.apache.texera.amber.operator.visualization.waterfallChart.WaterfallChartOpDesc
+import org.apache.texera.amber.operator.visualization.wordCloud.WordCloudOpDesc
 import org.apache.commons.lang3.builder.{EqualsBuilder, HashCodeBuilder, ToStringBuilder}
+import org.apache.texera.amber.operator.visualization.stripChart.StripChartOpDesc
 
 import java.util.UUID
 import scala.util.Try
@@ -200,8 +178,10 @@ trait StateTransferFunc
     new Type(value = classOf[RegexOpDesc], name = "Regex"),
     new Type(value = classOf[SpecializedFilterOpDesc], name = "Filter"),
     new Type(value = classOf[ProjectionOpDesc], name = "Projection"),
+    new Type(value = classOf[StripChartOpDesc], name = "StripChart"),
     new Type(value = classOf[UnionOpDesc], name = "Union"),
     new Type(value = classOf[KeywordSearchOpDesc], name = "KeywordSearch"),
+    new Type(value = classOf[SubstringSearchOpDesc], name = "SubstringSearch"),
     new Type(value = classOf[AggregateOpDesc], name = "Aggregate"),
     new Type(value = classOf[LineChartOpDesc], name = "LineChart"),
     new Type(value = classOf[WaterfallChartOpDesc], name = "WaterfallChart"),
@@ -271,6 +251,7 @@ trait StateTransferFunc
     new Type(value = classOf[ArrowSourceOpDesc], name = "ArrowSource"),
     new Type(value = classOf[MachineLearningScorerOpDesc], name = "Scorer"),
     new Type(value = classOf[SortOpDesc], name = "Sort"),
+    new Type(value = classOf[StableMergeSortOpDesc], name = "StableMergeSort"),
     new Type(value = classOf[SklearnLogisticRegressionOpDesc], name = "SklearnLogisticRegression"),
     new Type(
       value = classOf[SklearnLogisticRegressionCVOpDesc],
@@ -458,7 +439,7 @@ abstract class LogicalOp extends PortDescriptor with Serializable {
   def operatorInfo: OperatorInfo
 
   private def getOperatorVersion: String = {
-    val path = "core/amber/src/main/scala/"
+    val path = "amber/src/main/scala/"
     val operatorPath = path + this.getClass.getPackage.getName.replace(".", "/")
     OPVersion.getVersion(this.getClass.getSimpleName, operatorPath)
   }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PortDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PortDescriptor.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PortDescriptor.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PortDescriptor.scala
index e2cf9cf4c33..73f1ef26007 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PortDescriptor.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PortDescriptor.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator
+package org.apache.texera.amber.operator
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import edu.uci.ics.amber.core.workflow.PartitionInfo
+import org.apache.texera.amber.core.workflow.PartitionInfo
 
 case class PortDescription(
     portID: String,
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PythonOperatorDescriptor.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PythonOperatorDescriptor.scala
index 3ac12e6a61e..e47b32718a1 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PythonOperatorDescriptor.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator
+package org.apache.texera.amber.operator
 
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, PortIdentity, SchemaPropagationFunc}
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, PortIdentity, SchemaPropagationFunc}
 
 trait PythonOperatorDescriptor extends LogicalOp {
   private def generatePythonCodeForRaisingException(ex: Throwable): String = {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/SpecialPhysicalOpFactory.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/SpecialPhysicalOpFactory.scala
index 4554cad0cd3..07d0d7e5d33 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/SpecialPhysicalOpFactory.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator
+package org.apache.texera.amber.operator
 
-import edu.uci.ics.amber.core.executor.OpExecSource
-import edu.uci.ics.amber.core.storage.VFSURIFactory
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.executor.OpExecSource
+import org.apache.texera.amber.core.storage.VFSURIFactory
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   PhysicalOpIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow._
+import org.apache.texera.amber.core.workflow._
 
 import java.net.URI
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/TestOperators.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/TestOperators.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/TestOperators.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/TestOperators.scala
index 7f4cc8a80e0..ab7e8dc2de5 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/TestOperators.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/TestOperators.scala
@@ -17,26 +17,32 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator
+package org.apache.texera.amber.operator
 
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.amber.operator.aggregate.{
+import org.apache.texera.amber.core.storage.FileResolver
+import org.apache.texera.amber.operator.aggregate.{
   AggregateOpDesc,
   AggregationFunction,
   AggregationOperation
 }
-import edu.uci.ics.amber.operator.hashJoin.HashJoinOpDesc
-import edu.uci.ics.amber.operator.keywordSearch.KeywordSearchOpDesc
-import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc
-import edu.uci.ics.amber.operator.source.scan.json.JSONLScanSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.mysql.MySQLSourceOpDesc
-import edu.uci.ics.amber.operator.udf.python.PythonUDFOpDescV2
-import edu.uci.ics.amber.util.PathUtils
+import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc
+import org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpDesc
+import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc
+import org.apache.texera.amber.operator.source.scan.json.JSONLScanSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.mysql.MySQLSourceOpDesc
+import org.apache.texera.amber.operator.udf.python.PythonUDFOpDescV2
+
+import java.nio.file.Path
 
 object TestOperators {
 
-  val parentDir = PathUtils.corePath.resolve("workflow-operator").toRealPath().toString
+  val parentDir = Path
+    .of(sys.env.getOrElse("TEXERA_HOME", "."))
+    .resolve("common")
+    .resolve("workflow-operator")
+    .toRealPath()
+    .toString
   val CountrySalesSmallCsvPath = s"$parentDir/src/test/resources/country_sales_small.csv"
   val CountrySalesMediumCsvPath = s"$parentDir/src/test/resources/country_sales_medium.csv"
   val CountrySalesHeaderlessSmallCsvPath =
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpDesc.scala
index 7e75bb5efea..7e76b3ce7e0 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpDesc.scala
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.aggregate
+package org.apache.texera.amber.operator.aggregate
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   PhysicalOpIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeNameList
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeNameList
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import javax.validation.constraints.{NotNull, Size}
 
@@ -65,7 +65,10 @@ class AggregateOpDesc extends LogicalOp {
         PhysicalOpIdentity(operatorIdentifier, "localAgg"),
         workflowId,
         executionId,
-        OpExecWithClassName("edu.uci.ics.amber.operator.aggregate.AggregateOpExec", partialDesc)
+        OpExecWithClassName(
+          "org.apache.texera.amber.operator.aggregate.AggregateOpExec",
+          partialDesc
+        )
       )
       .withIsOneToManyOp(true)
       .withInputPorts(List(inputPort))
@@ -94,7 +97,7 @@ class AggregateOpDesc extends LogicalOp {
         PhysicalOpIdentity(operatorIdentifier, "globalAgg"),
         workflowId,
         executionId,
-        OpExecWithClassName("edu.uci.ics.amber.operator.aggregate.AggregateOpExec", finalDesc)
+        OpExecWithClassName("org.apache.texera.amber.operator.aggregate.AggregateOpExec", finalDesc)
       )
       .withParallelizable(false)
       .withIsOneToManyOp(true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpExec.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpExec.scala
index 0c7657b51a8..a61703b28cf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.aggregate
+package org.apache.texera.amber.operator.aggregate
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.collection.mutable
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregationFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationFunction.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregationFunction.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationFunction.java
index 027ee305e46..253d6548524 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregationFunction.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationFunction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.aggregate;
+package org.apache.texera.amber.operator.aggregate;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregationOperation.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationOperation.scala
similarity index 63%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregationOperation.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationOperation.scala
index c5d2730f02e..70105de9ef4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregationOperation.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationOperation.scala
@@ -17,15 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.aggregate
+package org.apache.texera.amber.operator.aggregate
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.parseTimestamp
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Tuple}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, AttributeTypeUtils, Tuple}
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
 
-import java.sql.Timestamp
 import javax.validation.constraints.NotNull
 
 case class AveragePartialObj(sum: Double, count: Double) extends Serializable {}
@@ -130,12 +128,12 @@ class AggregationOperation {
       )
     }
     new DistributedAggregation[Object](
-      () => zero(attributeType),
+      () => AttributeTypeUtils.zeroValue(attributeType),
       (partial, tuple) => {
         val value = tuple.getField[Object](attribute)
-        add(partial, value, attributeType)
+        AttributeTypeUtils.add(partial, value, attributeType)
       },
-      (partial1, partial2) => add(partial1, partial2, attributeType),
+      (partial1, partial2) => AttributeTypeUtils.add(partial1, partial2, attributeType),
       partial => partial
     )
   }
@@ -190,15 +188,16 @@ class AggregationOperation {
       )
     }
     new DistributedAggregation[Object](
-      () => maxValue(attributeType),
+      () => AttributeTypeUtils.maxValue(attributeType),
       (partial, tuple) => {
         val value = tuple.getField[Object](attribute)
-        val comp = compare(value, partial, attributeType)
+        val comp = AttributeTypeUtils.compare(value, partial, attributeType)
         if (value != null && comp < 0) value else partial
       },
       (partial1, partial2) =>
-        if (compare(partial1, partial2, attributeType) < 0) partial1 else partial2,
-      partial => if (partial == maxValue(attributeType)) null else partial
+        if (AttributeTypeUtils.compare(partial1, partial2, attributeType) < 0) partial1
+        else partial2,
+      partial => if (partial == AttributeTypeUtils.maxValue(attributeType)) null else partial
     )
   }
 
@@ -214,15 +213,16 @@ class AggregationOperation {
       )
     }
     new DistributedAggregation[Object](
-      () => minValue(attributeType),
+      () => AttributeTypeUtils.minValue(attributeType),
       (partial, tuple) => {
         val value = tuple.getField[Object](attribute)
-        val comp = compare(value, partial, attributeType)
+        val comp = AttributeTypeUtils.compare(value, partial, attributeType)
         if (value != null && comp > 0) value else partial
       },
       (partial1, partial2) =>
-        if (compare(partial1, partial2, attributeType) > 0) partial1 else partial2,
-      partial => if (partial == maxValue(attributeType)) null else partial
+        if (AttributeTypeUtils.compare(partial1, partial2, attributeType) > 0) partial1
+        else partial2,
+      partial => if (partial == AttributeTypeUtils.maxValue(attributeType)) null else partial
     )
   }
 
@@ -232,7 +232,7 @@ class AggregationOperation {
       return None
 
     if (tuple.getSchema.getAttribute(attribute).getType == AttributeType.TIMESTAMP)
-      Option(parseTimestamp(value.toString).getTime.toDouble)
+      Option(AttributeTypeUtils.parseTimestamp(value.toString).getTime.toDouble)
     else Option(value.toString.toDouble)
   }
 
@@ -254,94 +254,4 @@ class AggregationOperation {
       }
     )
   }
-
-  // return a.compare(b),
-  // < 0 if a < b,
-  // > 0 if a > b,
-  //   0 if a = b
-  private def compare(a: Object, b: Object, attributeType: AttributeType): Int = {
-    if (a == null && b == null) {
-      return 0
-    } else if (a == null) {
-      return -1
-    } else if (b == null) {
-      return 1
-    }
-    attributeType match {
-      case AttributeType.INTEGER => a.asInstanceOf[Integer].compareTo(b.asInstanceOf[Integer])
-      case AttributeType.DOUBLE =>
-        a.asInstanceOf[java.lang.Double].compareTo(b.asInstanceOf[java.lang.Double])
-      case AttributeType.LONG =>
-        a.asInstanceOf[java.lang.Long].compareTo(b.asInstanceOf[java.lang.Long])
-      case AttributeType.TIMESTAMP =>
-        a.asInstanceOf[Timestamp].getTime.compareTo(b.asInstanceOf[Timestamp].getTime)
-      case _ =>
-        throw new UnsupportedOperationException(
-          "Unsupported attribute type for comparison: " + attributeType
-        )
-    }
-  }
-
-  private def add(a: Object, b: Object, attributeType: AttributeType): Object = {
-    if (a == null && b == null) {
-      return zero(attributeType)
-    } else if (a == null) {
-      return b
-    } else if (b == null) {
-      return a
-    }
-    attributeType match {
-      case AttributeType.INTEGER =>
-        Integer.valueOf(a.asInstanceOf[Integer] + b.asInstanceOf[Integer])
-      case AttributeType.DOUBLE =>
-        java.lang.Double.valueOf(
-          a.asInstanceOf[java.lang.Double] + b.asInstanceOf[java.lang.Double]
-        )
-      case AttributeType.LONG =>
-        java.lang.Long.valueOf(a.asInstanceOf[java.lang.Long] + b.asInstanceOf[java.lang.Long])
-      case AttributeType.TIMESTAMP =>
-        new Timestamp(a.asInstanceOf[Timestamp].getTime + b.asInstanceOf[Timestamp].getTime)
-      case _ =>
-        throw new UnsupportedOperationException(
-          "Unsupported attribute type for addition: " + attributeType
-        )
-    }
-  }
-
-  private def zero(attributeType: AttributeType): Object =
-    attributeType match {
-      case AttributeType.INTEGER   => java.lang.Integer.valueOf(0)
-      case AttributeType.DOUBLE    => java.lang.Double.valueOf(0)
-      case AttributeType.LONG      => java.lang.Long.valueOf(0)
-      case AttributeType.TIMESTAMP => new Timestamp(0)
-      case _ =>
-        throw new UnsupportedOperationException(
-          "Unsupported attribute type for zero value: " + attributeType
-        )
-    }
-
-  private def maxValue(attributeType: AttributeType): Object =
-    attributeType match {
-      case AttributeType.INTEGER   => Integer.MAX_VALUE.asInstanceOf[Object]
-      case AttributeType.DOUBLE    => java.lang.Double.MAX_VALUE.asInstanceOf[Object]
-      case AttributeType.LONG      => java.lang.Long.MAX_VALUE.asInstanceOf[Object]
-      case AttributeType.TIMESTAMP => new Timestamp(java.lang.Long.MAX_VALUE)
-      case _ =>
-        throw new UnsupportedOperationException(
-          "Unsupported attribute type for max value: " + attributeType
-        )
-    }
-
-  private def minValue(attributeType: AttributeType): Object =
-    attributeType match {
-      case AttributeType.INTEGER   => Integer.MIN_VALUE.asInstanceOf[Object]
-      case AttributeType.DOUBLE    => java.lang.Double.MIN_VALUE.asInstanceOf[Object]
-      case AttributeType.LONG      => java.lang.Long.MIN_VALUE.asInstanceOf[Object]
-      case AttributeType.TIMESTAMP => new Timestamp(0)
-      case _ =>
-        throw new UnsupportedOperationException(
-          "Unsupported attribute type for min value: " + attributeType
-        )
-    }
-
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/DistributedAggregation.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/DistributedAggregation.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/DistributedAggregation.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/DistributedAggregation.scala
index f21ed567459..eab33e430be 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/DistributedAggregation.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/DistributedAggregation.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.aggregate
+package org.apache.texera.amber.operator.aggregate
 
-import edu.uci.ics.amber.core.tuple.Tuple
+import org.apache.texera.amber.core.tuple.Tuple
 
 /**
   * This class defines the necessary functions required by a distributed aggregation.
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpDesc.scala
index 7b7e283f6cc..16005c67a59 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.cartesianProduct
+package org.apache.texera.amber.operator.cartesianProduct
 
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class CartesianProductOpDesc extends LogicalOp {
   override def getPhysicalOp(
@@ -36,7 +36,9 @@ class CartesianProductOpDesc extends LogicalOp {
         workflowId,
         executionId,
         operatorIdentifier,
-        OpExecWithClassName("edu.uci.ics.amber.operator.cartesianProduct.CartesianProductOpExec")
+        OpExecWithClassName(
+          "org.apache.texera.amber.operator.cartesianProduct.CartesianProductOpExec"
+        )
       )
       .withInputPorts(operatorInfo.inputPorts)
       .withOutputPorts(operatorInfo.outputPorts)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExec.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExec.scala
index e6be218a472..c97487e06a6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExec.scala
@@ -17,11 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.cartesianProduct
+package org.apache.texera.amber.operator.cartesianProduct
+
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.operator.hashJoin.JoinUtils
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.operator.hashJoin.JoinUtils
 import scala.collection.mutable.ArrayBuffer
 
 /**
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpDesc.scala
similarity index 79%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpDesc.scala
index b18afc0455d..cfb2b5e76fa 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpDesc.scala
@@ -17,17 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.dictionary
+package org.apache.texera.amber.operator.dictionary
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.map.MapOpDesc
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{
+  InputPort,
+  OutputPort,
+  PhysicalOp,
+  SchemaPropagationFunc
+}
+import org.apache.texera.amber.operator.map.MapOpDesc
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 /**
   * Dictionary matcher operator matches a tuple if the specified column is in the given dictionary.
@@ -58,7 +63,7 @@ class DictionaryMatcherOpDesc extends MapOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.dictionary.DictionaryMatcherOpExec",
+          "org.apache.texera.amber.operator.dictionary.DictionaryMatcherOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExec.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExec.scala
index 77b59a2716b..2d4eaf612e4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.dictionary
+package org.apache.texera.amber.operator.dictionary
 
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.operator.map.MapOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.operator.map.MapOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.apache.lucene.analysis.Analyzer
 import org.apache.lucene.analysis.en.EnglishAnalyzer
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/MatchingType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/MatchingType.java
similarity index 97%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/MatchingType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/MatchingType.java
index 5732c6c2e83..d2d27e822de 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/MatchingType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/MatchingType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.dictionary;
+package org.apache.texera.amber.operator.dictionary;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpDesc.scala
similarity index 80%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpDesc.scala
index 13ea6a707c9..c12f057a25b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.difference
+package org.apache.texera.amber.operator.difference
 
 import com.google.common.base.Preconditions
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class DifferenceOpDesc extends LogicalOp {
 
@@ -37,7 +37,7 @@ class DifferenceOpDesc extends LogicalOp {
         workflowId,
         executionId,
         operatorIdentifier,
-        OpExecWithClassName("edu.uci.ics.amber.operator.difference.DifferenceOpExec")
+        OpExecWithClassName("org.apache.texera.amber.operator.difference.DifferenceOpExec")
       )
       .withInputPorts(operatorInfo.inputPorts)
       .withOutputPorts(operatorInfo.outputPorts)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpExec.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpExec.scala
index c049e424c2f..27a9941dc9d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.difference
+package org.apache.texera.amber.operator.difference
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 import scala.collection.mutable
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpDesc.scala
similarity index 74%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpDesc.scala
index c36ac574ff2..9e75e648bb4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpDesc.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.distinct
+package org.apache.texera.amber.operator.distinct
 
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{HashPartition, InputPort, OutputPort, PhysicalOp}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{HashPartition, InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class DistinctOpDesc extends LogicalOp {
 
@@ -36,7 +36,7 @@ class DistinctOpDesc extends LogicalOp {
         workflowId,
         executionId,
         operatorIdentifier,
-        OpExecWithClassName("edu.uci.ics.amber.operator.distinct.DistinctOpExec")
+        OpExecWithClassName("org.apache.texera.amber.operator.distinct.DistinctOpExec")
       )
       .withInputPorts(operatorInfo.inputPorts)
       .withOutputPorts(operatorInfo.outputPorts)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpExec.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpExec.scala
index 99083d1683c..50348581a05 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.distinct
+package org.apache.texera.amber.operator.distinct
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 import scala.collection.mutable
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dummy/DummyOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dummy/DummyOpDesc.scala
index 3252571c57e..c1ae1dd05fc 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dummy/DummyOpDesc.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.dummy
+package org.apache.texera.amber.operator.dummy
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, PortDescriptor}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.{LogicalOp, PortDescription, PortDescriptor}
 
 class DummyOpDesc extends LogicalOp with PortDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/ComparisonType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/ComparisonType.java
similarity index 97%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/ComparisonType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/ComparisonType.java
index e9fe3c970e0..2c8216a123d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/ComparisonType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/ComparisonType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter;
+package org.apache.texera.amber.operator.filter;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpDesc.scala
similarity index 81%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpDesc.scala
index 51313da9ebb..a12ab5097f4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpDesc.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter
+package org.apache.texera.amber.operator.filter
 
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.{LogicalOp, StateTransferFunc}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.PhysicalOp
+import org.apache.texera.amber.operator.{LogicalOp, StateTransferFunc}
 
 import scala.util.{Success, Try}
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpExec.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpExec.scala
index d54a59ab6dc..071faf65bae 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter
+package org.apache.texera.amber.operator.filter
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 abstract class FilterOpExec extends OperatorExecutor with Serializable {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterPredicate.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterPredicate.java
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterPredicate.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterPredicate.java
index 21059eb2775..3732bd23e3d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterPredicate.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterPredicate.java
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter;
+package org.apache.texera.amber.operator.filter;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString;
-import edu.uci.ics.amber.core.tuple.AttributeType;
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils;
-import edu.uci.ics.amber.core.tuple.Tuple;
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName;
-import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation;
+import org.apache.texera.amber.core.tuple.AttributeType;
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils;
+import org.apache.texera.amber.core.tuple.Tuple;
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName;
+import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation;
 
 import java.sql.Timestamp;
 import java.util.Objects;
@@ -85,9 +85,9 @@ private static <T extends Comparable<T>> boolean evaluateFilter(T tupleValue, T
     @JsonIgnore
     public boolean evaluate(Tuple tuple) {
         boolean isFieldNull = tuple.getField(attribute) == null;
-        if (condition == edu.uci.ics.amber.operator.filter.ComparisonType.IS_NULL) {
+        if (condition == org.apache.texera.amber.operator.filter.ComparisonType.IS_NULL) {
             return isFieldNull;
-        } else if (condition == edu.uci.ics.amber.operator.filter.ComparisonType.IS_NOT_NULL) {
+        } else if (condition == org.apache.texera.amber.operator.filter.ComparisonType.IS_NOT_NULL) {
             return !isFieldNull;
         } else if (isFieldNull) {
             return false;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpDesc.scala
similarity index 78%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpDesc.scala
index 57d92fc29be..9e86773df7c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpDesc.scala
@@ -17,15 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter
+package org.apache.texera.amber.operator.filter
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class SpecializedFilterOpDesc extends FilterOpDesc {
 
@@ -43,7 +42,7 @@ class SpecializedFilterOpDesc extends FilterOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.filter.SpecializedFilterOpExec",
+          "org.apache.texera.amber.operator.filter.SpecializedFilterOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExec.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExec.scala
index d2879ce0cdd..30f1d955865 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter
+package org.apache.texera.amber.operator.filter
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class SpecializedFilterOpExec(descString: String) extends FilterOpExec {
   private val desc: SpecializedFilterOpDesc =
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/flatmap/FlatMapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/flatmap/FlatMapOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpDesc.scala
index 3e87f3f2c32..05ef92a7138 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/flatmap/FlatMapOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpDesc.scala
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.flatmap
+package org.apache.texera.amber.operator.flatmap
 
-import edu.uci.ics.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.LogicalOp
 
 abstract class FlatMapOpDesc extends LogicalOp {}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/flatmap/FlatMapOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpExec.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/flatmap/FlatMapOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpExec.scala
index 8f5574dfb4d..4666fc35100 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/flatmap/FlatMapOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.flatmap
+package org.apache.texera.amber.operator.flatmap
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 /**
   * Executes a flatMap() operation.
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinBuildOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinBuildOpExec.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinBuildOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinBuildOpExec.scala
index f21b894e7e9..459a2190b0b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinBuildOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinBuildOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.hashJoin
+package org.apache.texera.amber.operator.hashJoin
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpDesc.scala
index 1fc5f484e67..708546a84ad 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpDesc.scala
@@ -17,26 +17,26 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.hashJoin
+package org.apache.texera.amber.operator.hashJoin
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.virtualidentity.{
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{
   ExecutionIdentity,
   PhysicalOpIdentity,
   WorkflowIdentity
 }
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   AutofillAttributeNameOnPort1
 }
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 object HashJoinOpDesc {
   val HASH_JOIN_INTERNAL_KEY_NAME = "__internal__hashtable__key__"
@@ -87,7 +87,7 @@ class HashJoinOpDesc[K] extends LogicalOp {
           workflowId,
           executionId,
           OpExecWithClassName(
-            "edu.uci.ics.amber.operator.hashJoin.HashJoinBuildOpExec",
+            "org.apache.texera.amber.operator.hashJoin.HashJoinBuildOpExec",
             objectMapper.writeValueAsString(this)
           )
         )
@@ -125,7 +125,7 @@ class HashJoinOpDesc[K] extends LogicalOp {
           workflowId,
           executionId,
           OpExecWithClassName(
-            "edu.uci.ics.amber.operator.hashJoin.HashJoinProbeOpExec",
+            "org.apache.texera.amber.operator.hashJoin.HashJoinProbeOpExec",
             objectMapper.writeValueAsString(this)
           )
         )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinProbeOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinProbeOpExec.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinProbeOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinProbeOpExec.scala
index 1697e98bd72..a27ae1d5e24 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinProbeOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinProbeOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.hashJoin
+package org.apache.texera.amber.operator.hashJoin
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/JoinType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/JoinType.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/JoinType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/JoinType.java
index 49381ae030b..5ac03b3b873 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/JoinType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/JoinType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.hashJoin;
+package org.apache.texera.amber.operator.hashJoin;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala
index d15d191a3d8..81ae9e03df5 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.huggingFace
+package org.apache.texera.amber.operator.huggingFace
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class HuggingFaceIrisLogisticRegressionOpDesc extends PythonOperatorDescriptor {
 
   @JsonProperty(value = "petalLengthCmAttribute", required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala
index b93fbde802b..551b25b4810 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.huggingFace
+package org.apache.texera.amber.operator.huggingFace
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class HuggingFaceSentimentAnalysisOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "attribute", required = true)
   @JsonPropertyDescription("column to perform sentiment analysis on")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala
index cd615c96071..d5fdb24deba 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.huggingFace
+package org.apache.texera.amber.operator.huggingFace
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class HuggingFaceSpamSMSDetectionOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "attribute", required = true)
   @JsonPropertyDescription("column to perform spam detection on")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala
index e2e0b78295b..41d16c5c1b4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.huggingFace
+package org.apache.texera.amber.operator.huggingFace
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class HuggingFaceTextSummarizationOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "attribute", required = true)
   @JsonPropertyDescription("attribute to perform text summarization on")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/ifStatement/IfOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpDesc.scala
similarity index 80%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/ifStatement/IfOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpDesc.scala
index c81bda2dc6c..f811ed34296 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/ifStatement/IfOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpDesc.scala
@@ -17,22 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.ifStatement
+package org.apache.texera.amber.operator.ifStatement
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{
-  InputPort,
-  OutputPort,
-  PhysicalOp,
-  PortIdentity,
-  SchemaPropagationFunc
-}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class IfOpDesc extends LogicalOp {
   @JsonProperty(required = true)
@@ -50,7 +44,7 @@ class IfOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.ifStatement.IfOpExec",
+          "org.apache.texera.amber.operator.ifStatement.IfOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/ifStatement/IfOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpExec.scala
similarity index 83%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/ifStatement/IfOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpExec.scala
index a4ff24fae45..462bdd0969a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/ifStatement/IfOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.ifStatement
+package org.apache.texera.amber.operator.ifStatement
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.state.State
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.state.State
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class IfOpExec(descString: String) extends OperatorExecutor {
   private val desc: IfOpDesc = objectMapper.readValue(descString, classOf[IfOpDesc])
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpDesc.scala
similarity index 77%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpDesc.scala
index f7bab21aa1a..323d51b0ad5 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpDesc.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intersect
+package org.apache.texera.amber.operator.intersect
 
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class IntersectOpDesc extends LogicalOp {
 
@@ -36,7 +36,7 @@ class IntersectOpDesc extends LogicalOp {
         workflowId,
         executionId,
         operatorIdentifier,
-        OpExecWithClassName("edu.uci.ics.amber.operator.intersect.IntersectOpExec")
+        OpExecWithClassName("org.apache.texera.amber.operator.intersect.IntersectOpExec")
       )
       .withInputPorts(operatorInfo.inputPorts)
       .withOutputPorts(operatorInfo.outputPorts)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpExec.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpExec.scala
index 8d45b7971c6..973abbcfbe1 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intersect
+package org.apache.texera.amber.operator.intersect
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 import scala.collection.mutable
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpDesc.scala
index 4b04bef5041..2218fe2cce1 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpDesc.scala
@@ -17,23 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intervalJoin
+package org.apache.texera.amber.operator.intervalJoin
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.workflow.{HashPartition, PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   AutofillAttributeNameOnPort1
 }
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 /** This Operator have two assumptions:
   * 1. The tuples in both inputs come in ascending order
@@ -103,7 +102,7 @@ class IntervalJoinOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.intervalJoin.IntervalJoinOpExec",
+          "org.apache.texera.amber.operator.intervalJoin.IntervalJoinOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpExec.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpExec.scala
index 65aead4f7ab..4a4c987540d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpExec.scala
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intervalJoin
+package org.apache.texera.amber.operator.intervalJoin
+
+import org.apache.texera.amber.core.WorkflowRuntimeException
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{AttributeType, Tuple, TupleLike}
+import org.apache.texera.amber.operator.hashJoin.JoinUtils
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
-import edu.uci.ics.amber.core.WorkflowRuntimeException
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple, TupleLike}
-import edu.uci.ics.amber.operator.hashJoin.JoinUtils
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
 import java.sql.Timestamp
 import scala.collection.mutable.ListBuffer
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/TimeIntervalType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/TimeIntervalType.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/TimeIntervalType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/TimeIntervalType.java
index 9c039532659..2070b950443 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/TimeIntervalType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/TimeIntervalType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intervalJoin;
+package org.apache.texera.amber.operator.intervalJoin;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpDesc.scala
similarity index 76%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpDesc.scala
index 6e655dd36ea..0aef079e61a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpDesc.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.keywordSearch
+package org.apache.texera.amber.operator.keywordSearch
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.filter.FilterOpDesc
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.filter.FilterOpDesc
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class KeywordSearchOpDesc extends FilterOpDesc {
 
@@ -53,7 +52,7 @@ class KeywordSearchOpDesc extends FilterOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.keywordSearch.KeywordSearchOpExec",
+          "org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExec.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExec.scala
index c2f2e6a3f6e..1354f2f0aff 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.keywordSearch
+package org.apache.texera.amber.operator.keywordSearch
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.operator.filter.FilterOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.operator.filter.FilterOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.apache.lucene.analysis.standard.StandardAnalyzer
 import org.apache.lucene.index.memory.MemoryIndex
 import org.apache.lucene.queryparser.classic.QueryParser
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpDesc.scala
similarity index 81%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpDesc.scala
index 4562450b9e7..6e1b7f37af3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpDesc.scala
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.limit
+package org.apache.texera.amber.operator.limit
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.{LogicalOp, StateTransferFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.{LogicalOp, StateTransferFunc}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.util.{Success, Try}
 
@@ -48,7 +47,7 @@ class LimitOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.limit.LimitOpExec",
+          "org.apache.texera.amber.operator.limit.LimitOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpExec.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpExec.scala
index 8ed5b1a63ab..09046149097 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.limit
+package org.apache.texera.amber.operator.limit
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class LimitOpExec(descString: String) extends OperatorExecutor {
   private val desc: LimitOpDesc = objectMapper.readValue(descString, classOf[LimitOpDesc])
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala
index d46f75e67e4..0020b547aee 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.Scorer
+package org.apache.texera.amber.operator.machineLearning.Scorer
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -25,11 +25,11 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaString,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.{AutofillAttributeName, HideAnnotation}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.{AutofillAttributeName, HideAnnotation}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class MachineLearningScorerOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(required = true, defaultValue = "false")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java
index a1e9da28c5b..b426b6a2ca8 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.Scorer;
+package org.apache.texera.amber.operator.machineLearning.Scorer;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java
index f36748835c1..6ca830326f2 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.Scorer;
+package org.apache.texera.amber.operator.machineLearning.Scorer;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala
index b164ba3135c..33b7ccb4e5b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
 
 class SklearnAdvancedKNNClassifierTrainerOpDesc
     extends SklearnMLOperatorDescriptor[SklearnAdvancedKNNParameters] {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java
index 57785b58c1d..7bb8c9dd9ac 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer;
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer;
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass;
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass;
 
 public enum SklearnAdvancedKNNParameters implements ParamClass {
     n_neighbors("n_neighbors", "int"),
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala
index f263df4e7f0..aaab2a5631c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
 
 class SklearnAdvancedKNNRegressorTrainerOpDesc
     extends SklearnMLOperatorDescriptor[SklearnAdvancedKNNParameters] {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java
index 36946ffbbd0..c2e6b6df3f6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer;
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer;
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass;
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass;
 
 public enum SklearnAdvancedSVCParameters implements ParamClass {
     C("C", "float"),
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala
index 776a7b3bdf3..8e1b9c9acce 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
 
 class SklearnAdvancedSVCTrainerOpDesc
     extends SklearnMLOperatorDescriptor[SklearnAdvancedSVCParameters] {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java
index e53a1cebe21..898db274dc8 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer;
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer;
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass;
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass;
 
 public enum SklearnAdvancedSVRParameters implements ParamClass {
     C("C", "float"),
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala
similarity index 79%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala
index 5c02882968f..5632a7614f8 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer
 
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer.SklearnAdvancedSVRParameters
-import edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
+import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor
 
 class SklearnAdvancedSVRTrainerOpDesc
     extends SklearnMLOperatorDescriptor[SklearnAdvancedSVRParameters] {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java
index 2a43d85277f..06906325ba3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base;
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.kjetland.jackson.jsonSchema.annotations.*;
-import edu.uci.ics.amber.operator.metadata.annotations.CommonOpDescAnnotation;
-import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation;
+import org.apache.texera.amber.operator.metadata.annotations.CommonOpDescAnnotation;
+import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation;
 
 public class HyperParameters<T> {
     @JsonProperty(required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala
index f6dac5f16b4..189eb0be799 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base
+package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   AutofillAttributeNameList
 }
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 trait ParamClass {
   def getName: String
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpDesc.scala
similarity index 81%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpDesc.scala
index 4909623a934..e407c52e0bf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpDesc.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.map
+package org.apache.texera.amber.operator.map
 
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.{LogicalOp, StateTransferFunc}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.PhysicalOp
+import org.apache.texera.amber.operator.{LogicalOp, StateTransferFunc}
 
 import scala.util.{Success, Try}
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpExec.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpExec.scala
index 8e4c2356690..a7abf7cde11 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.map
+package org.apache.texera.amber.operator.map
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 /**
   * Common operator executor of a map() function
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OPVersion.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OPVersion.java
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OPVersion.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OPVersion.java
index e9dd61eeed5..acf8828d560 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OPVersion.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OPVersion.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata;
+package org.apache.texera.amber.operator.metadata;
 
-import edu.uci.ics.amber.util.PathUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,7 +33,7 @@ public class OPVersion {
     private static Map<String, String> opMap = new HashMap<>();
     static {
         try {
-            git = Git.open(new File(PathUtils.gitDirectoryPath().toString()));
+            git = Git.open(new File(Path.of(System.getenv().getOrDefault("TEXERA_HOME", ".")).toString()));
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorGroupConstants.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorGroupConstants.scala
similarity index 98%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorGroupConstants.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorGroupConstants.scala
index 89822b79462..27ec48d4731 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorGroupConstants.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorGroupConstants.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata
+package org.apache.texera.amber.operator.metadata
 
 object OperatorGroupConstants {
   final val INPUT_GROUP = "Data Input"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorMetadataGenerator.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorMetadataGenerator.scala
index 502274ab7e1..6899f06a2d5 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorMetadataGenerator.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata
+package org.apache.texera.amber.operator.metadata
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver
@@ -25,10 +25,10 @@ import com.fasterxml.jackson.databind.jsontype.NamedType
 import com.fasterxml.jackson.databind.node.{ArrayNode, ObjectNode}
 import com.kjetland.jackson.jsonSchema.JsonSchemaConfig.html5EnabledSchema
 import com.kjetland.jackson.jsonSchema.{JsonSchemaConfig, JsonSchemaDraft, JsonSchemaGenerator}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
-import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.util
 import scala.jdk.CollectionConverters.{IteratorHasAsScala, ListHasAsScala}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/PropertyNameConstants.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/PropertyNameConstants.scala
similarity index 97%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/PropertyNameConstants.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/PropertyNameConstants.scala
index 9cd554a1da7..52bb0414692 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/PropertyNameConstants.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/PropertyNameConstants.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata
+package org.apache.texera.amber.operator.metadata
 
 /**
   * PropertyNameConstants defines the key names
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeName.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeName.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeName.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeName.java
index dd4dedde16b..f53a081f8c2 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeName.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeName.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java
similarity index 97%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java
index 57399e1f419..2fd22628e82 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameList.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameList.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameList.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameList.java
index 7fdbb414f22..1178245ee54 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameList.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameList.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java
index e8254f66339..451665900cb 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/BatchByColumn.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/BatchByColumn.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/BatchByColumn.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/BatchByColumn.java
index 2d23a04bb57..c070614f2cf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/BatchByColumn.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/BatchByColumn.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/CommonOpDescAnnotation.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/CommonOpDescAnnotation.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/CommonOpDescAnnotation.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/CommonOpDescAnnotation.java
index f99e3313d4b..9402348102e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/CommonOpDescAnnotation.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/CommonOpDescAnnotation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 public class CommonOpDescAnnotation {
     // JSON schema key
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/EnablePresets.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/EnablePresets.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/EnablePresets.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/EnablePresets.java
index 9e1e59bb04e..f70971edd42 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/EnablePresets.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/EnablePresets.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaBool;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/HideAnnotation.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/HideAnnotation.java
similarity index 97%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/HideAnnotation.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/HideAnnotation.java
index 51b1c177ede..3973f5860be 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/HideAnnotation.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/HideAnnotation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 /* For every hide annotation, you specify on a formly field three things:
     the target (field name of dependent comparison),
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/UIWidget.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/UIWidget.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/UIWidget.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/UIWidget.java
index c4a1cfcdd5f..04bc6a05e68 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/annotations/UIWidget.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/UIWidget.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.metadata.annotations;
+package org.apache.texera.amber.operator.metadata.annotations;
 
 public class UIWidget {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/AttributeUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/AttributeUnit.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/AttributeUnit.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/AttributeUnit.java
index 1c69f5d912c..2c7bf3585c4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/AttributeUnit.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/AttributeUnit.java
@@ -17,14 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.projection;
+package org.apache.texera.amber.operator.projection;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName;
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName;
 import org.jooq.tools.StringUtils;
+
 import java.util.Objects;
 
 public class AttributeUnit{
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpDesc.scala
similarity index 83%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpDesc.scala
index f78ab51beeb..3af25b98326 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpDesc.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.projection
+package org.apache.texera.amber.operator.projection
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.PhysicalOp.oneToOnePhysicalOp
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.map.MapOpDesc
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.PhysicalOp.oneToOnePhysicalOp
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.map.MapOpDesc
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class ProjectionOpDesc extends MapOpDesc {
 
@@ -48,7 +48,7 @@ class ProjectionOpDesc extends MapOpDesc {
       executionId,
       operatorIdentifier,
       OpExecWithClassName(
-        "edu.uci.ics.amber.operator.projection.ProjectionOpExec",
+        "org.apache.texera.amber.operator.projection.ProjectionOpExec",
         objectMapper.writeValueAsString(this)
       )
     )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpExec.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpExec.scala
index 0e9d9148f82..158d15e274e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.projection
+package org.apache.texera.amber.operator.projection
 
 import com.google.common.base.Preconditions
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.operator.map.MapOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.operator.map.MapOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.collection.mutable
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpDesc.scala
similarity index 76%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpDesc.scala
index 8fe861547d6..31cafcbc76b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpDesc.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.randomksampling
+package org.apache.texera.amber.operator.randomksampling
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
-import edu.uci.ics.amber.operator.filter.FilterOpDesc
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.filter.FilterOpDesc
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class RandomKSamplingOpDesc extends FilterOpDesc {
 
@@ -43,7 +43,7 @@ class RandomKSamplingOpDesc extends FilterOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.randomksampling.RandomKSamplingOpExec",
+          "org.apache.texera.amber.operator.randomksampling.RandomKSamplingOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpExec.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpExec.scala
index 303b721f65b..a23ed5a74ea 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.randomksampling
+package org.apache.texera.amber.operator.randomksampling
 
-import edu.uci.ics.amber.operator.filter.FilterOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.operator.filter.FilterOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.util.Random
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpDesc.scala
similarity index 78%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpDesc.scala
index 995169ebc08..0f886ae53be 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpDesc.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.regex
+package org.apache.texera.amber.operator.regex
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.filter.FilterOpDesc
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.filter.FilterOpDesc
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class RegexOpDesc extends FilterOpDesc {
 
@@ -56,7 +55,7 @@ class RegexOpDesc extends FilterOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.regex.RegexOpExec",
+          "org.apache.texera.amber.operator.regex.RegexOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpExec.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpExec.scala
index 14ec484e6bd..c8e840de5be 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.regex
+package org.apache.texera.amber.operator.regex
 
-import edu.uci.ics.amber.core.tuple.Tuple
-import edu.uci.ics.amber.operator.filter.FilterOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.operator.filter.FilterOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.util.regex.Pattern
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala
similarity index 76%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala
index 3a690143ece..eda2aa299fe 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala
@@ -17,16 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.reservoirsampling
+package org.apache.texera.amber.operator.reservoirsampling
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.PhysicalOp
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class ReservoirSamplingOpDesc extends LogicalOp {
 
@@ -44,7 +43,7 @@ class ReservoirSamplingOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.reservoirsampling.ReservoirSamplingOpExec",
+          "org.apache.texera.amber.operator.reservoirsampling.ReservoirSamplingOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala
index fe76f6bac16..155b0c99b24 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.reservoirsampling
+package org.apache.texera.amber.operator.reservoirsampling
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.operator.util.OperatorDescriptorUtils.equallyPartitionGoal
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.operator.util.OperatorDescriptorUtils.equallyPartitionGoal
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.util.Random
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/ProgressiveUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sink/ProgressiveUtils.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/ProgressiveUtils.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sink/ProgressiveUtils.scala
index 2f8f490edc9..aee2b6237b7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/ProgressiveUtils.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sink/ProgressiveUtils.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sink
+package org.apache.texera.amber.operator.sink
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
 
 object ProgressiveUtils {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala
index a64856ff490..9d8d66917d6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnAdaptiveBoostingOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.ensemble import AdaBoostClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnBaggingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBaggingOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnBaggingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBaggingOpDesc.scala
index 4733fcb4aa6..59cba35ba67 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnBaggingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBaggingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnBaggingOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.ensemble import BaggingClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala
index 97bed28ff42..ddee295588a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnBernoulliNaiveBayesOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import BernoulliNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnClassifierOpDesc.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnClassifierOpDesc.scala
index 1daf9678346..3fcea191e18 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnClassifierOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -26,15 +26,15 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaString,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   CommonOpDescAnnotation,
   HideAnnotation
 }
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 abstract class SklearnClassifierOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala
index 10c1704deb7..171a0a2717b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnComplementNaiveBayesOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import ComplementNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala
index 1d08a38d423..80827b9c64d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnDecisionTreeOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.tree import DecisionTreeClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala
index b4eeedbc5c1..2e4d8367944 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnDummyClassifierOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.dummy import dummy"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala
index 76b4aee2df6..c7c5d7d9b8c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnExtraTreeOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.tree import ExtraTreeClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala
index b5e89b41053..b8bda3b4e70 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnExtraTreesOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.ensemble import ExtraTreesClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala
index b479dedaa48..0b9c9efecee 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnGaussianNaiveBayesOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import GaussianNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala
index 42621114a82..52184a26420 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnGradientBoostingOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.ensemble import GradientBoostingClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnKNNOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnKNNOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnKNNOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnKNNOpDesc.scala
index d22cbc6e8dd..df919963f8c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnKNNOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnKNNOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnKNNOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.neighbors import KNeighborsClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala
index df44b7f8d04..1c4c7e6288c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class SklearnLinearRegressionOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala
index 9b26b10b839..5d1c9977f88 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnLinearSVMOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.svm import LinearSVC"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala
index 1ce221c7ea1..4e50b934ff4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnLogisticRegressionCVOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import LogisticRegressionCV"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala
index 8a93e4c498e..19d07097f10 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnLogisticRegressionOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import LogisticRegression"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala
index aa84b372274..03694aaee4c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnMultiLayerPerceptronOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.neural_network import MLPClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala
index a10a535d6ec..cd8ba43f2ba 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnMultinomialNaiveBayesOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import MultinomialNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala
index fe16d8832aa..f9fd36e9e06 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnNearestCentroidOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.neighbors import NearestCentroid"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala
index 0fa031a7b67..791b0bf4a0e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnPassiveAggressiveOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import PassiveAggressiveClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPerceptronOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPerceptronOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPerceptronOpDesc.scala
index f86a9947a51..221863dbd00 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPerceptronOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPerceptronOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnPerceptronOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import Perceptron"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPredictionOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPredictionOpDesc.scala
index 9a013d2025f..0e0a5772f36 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPredictionOpDesc.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   AutofillAttributeNameOnPort1
 }
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class SklearnPredictionOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "Model Attribute", required = true, defaultValue = "model")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala
index 38f9da4cc46..fd53a665cdf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnProbabilityCalibrationOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.calibration import CalibratedClassifierCV"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRandomForestOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRandomForestOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRandomForestOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRandomForestOpDesc.scala
index 0dc038b1aca..f2f3a51cf8a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRandomForestOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRandomForestOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnRandomForestOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.ensemble import RandomForestClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala
index 2de75356e2d..ae5d2dbc916 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnRidgeCVOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import RidgeClassifierCV"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRidgeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRidgeOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeOpDesc.scala
index a1231fea5a9..52ffebb71d6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnRidgeOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnRidgeOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import RidgeClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnSDGOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSDGOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnSDGOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSDGOpDesc.scala
index af5df695764..b88f792e975 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnSDGOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSDGOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnSDGOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.linear_model import SGDClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSVMOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnSVMOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSVMOpDesc.scala
index 789bb26d1fe..02eea7dee4a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnSVMOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSVMOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn
+package org.apache.texera.amber.operator.sklearn
 
 class SklearnSVMOpDesc extends SklearnClassifierOpDesc {
   override def getImportStatements = "from sklearn.svm import SVC"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala
index b43b74a96bb..d9558dc3da1 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingAdaptiveBoostingOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.ensemble import AdaBoostClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala
index b7032b2b796..4db059d1096 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingBaggingOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.ensemble import BaggingClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala
index ce42098272f..92672cf15a4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingBernoulliNaiveBayesOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import BernoulliNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala
index 3bca117bd6a..53b540aca18 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingComplementNaiveBayesOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import ComplementNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala
index 848cc494d0e..8fb45fba078 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingDecisionTreeOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.tree import DecisionTreeClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala
index 4cdd88abf12..4ad7af21814 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingDummyClassifierOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.dummy import dummy"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala
index a19cbd8dd65..34d362700c9 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingExtraTreeOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.tree import ExtraTreeClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala
index 923198fb01c..155d6facbe8 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingExtraTreesOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.ensemble import ExtraTreesClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala
index 4308d4b5480..8d4101b2689 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingGaussianNaiveBayesOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import GaussianNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala
index aba3d078874..68fd0cd7a85 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingGradientBoostingOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.ensemble import GradientBoostingClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala
index 01cbe79f4a3..7a56c28b795 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingKNNOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.neighbors import KNeighborsClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala
index 12d5eddb874..1fc1a002525 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingLinearRegressionOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import LinearRegression"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala
index 7932658a230..c65b4fcab0f 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingLinearSVMOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.svm import LinearSVC"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala
index 0bf34f51e3c..edf1fa59999 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingLogisticRegressionCVOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import LogisticRegressionCV"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala
index e232c7dfaf7..42b5db73bbd 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingLogisticRegressionOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import LogisticRegression"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala
index c0082aa2ca9..dc19592a18d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingMultiLayerPerceptronOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.neural_network import MLPClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala
index 42bc680bfa1..653cc8a32aa 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingMultinomialNaiveBayesOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.naive_bayes import MultinomialNB"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala
index 1dcc0dcdfd0..0ae83b73aaa 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingNearestCentroidOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.neighbors import NearestCentroid"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala
index 2c12ccf8867..c842ffafac3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -26,15 +26,15 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaString,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   CommonOpDescAnnotation,
   HideAnnotation
 }
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class SklearnTrainingOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala
index cd589cf6f26..eeb97394dc7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingPassiveAggressiveOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import PassiveAggressiveClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala
index 242b0dabac1..cae3462f493 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingPerceptronOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import Perceptron"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala
index bbe3136d323..bb1a2377d30 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingProbabilityCalibrationOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.calibration import CalibratedClassifierCV"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala
index e28c36d0660..a9121052d54 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingRandomForestOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.ensemble import RandomForestClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala
index 005e6cea68f..459f0f85fc0 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingRidgeCVOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import RidgeClassifierCV"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala
index f14c45ed057..2e60ca2c9cf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingRidgeOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import RidgeClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala
index 1e44ed93703..821aafc7edb 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingSDGOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.linear_model import SGDClassifier"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala
index 6546ccfe3c5..cc51b1acb0b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sklearn.training
+package org.apache.texera.amber.operator.sklearn.training
 
 class SklearnTrainingSVMOpDesc extends SklearnTrainingOpDesc {
   override def getImportStatements = "from sklearn.svm import SVC"
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sleep/SleepOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpDesc.scala
similarity index 76%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sleep/SleepOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpDesc.scala
index 0b709df07a8..3eee3cd33b7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sleep/SleepOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sleep
+package org.apache.texera.amber.operator.sleep
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class SleepOpDesc extends LogicalOp {
 
@@ -44,7 +44,7 @@ class SleepOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.sleep.SleepOpExec",
+          "org.apache.texera.amber.operator.sleep.SleepOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sleep/SleepOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpExec.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sleep/SleepOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpExec.scala
index c5b6c2781dc..87255c900e9 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sleep/SleepOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sleep
+package org.apache.texera.amber.operator.sleep
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class SleepOpExec(descString: String) extends OperatorExecutor {
   private val desc: SleepOpDesc = objectMapper.readValue(descString, classOf[SleepOpDesc])
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortCriteriaUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortCriteriaUnit.java
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortCriteriaUnit.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortCriteriaUnit.java
index 8c4095220d6..09c35a8c1b6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortCriteriaUnit.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortCriteriaUnit.java
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sort;
+package org.apache.texera.amber.operator.sort;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName;
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName;
 
 public class SortCriteriaUnit {
 
@@ -32,5 +32,5 @@ public class SortCriteriaUnit {
 
     @JsonProperty(value = "sortPreference", required = true)
     @JsonPropertyDescription("Sort preference (ASC or DESC)")
-    public edu.uci.ics.amber.operator.sort.SortPreference sortPreference;
+    public org.apache.texera.amber.operator.sort.SortPreference sortPreference;
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortOpDesc.scala
index 22b5f92b00f..2e46fb81333 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortOpDesc.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sort
+package org.apache.texera.amber.operator.sort
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class SortOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(required = true)
   @JsonPropertyDescription("column to perform sorting on")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortPreference.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortPreference.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortPreference.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortPreference.java
index 595dddfd3a2..40914a7f8de 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortPreference.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortPreference.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sort;
+package org.apache.texera.amber.operator.sort;
 
 public enum SortPreference {
     ASC, DESC
diff --git a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpDesc.scala
new file mode 100644
index 00000000000..318089da5e3
--- /dev/null
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpDesc.scala
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.sort
+
+import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
+import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+
+import scala.collection.mutable.ListBuffer
+
+/**
+  * This operator performs a stable, per-partition sort using an incremental
+  * stack of sorted buckets and pairwise stable merges. The sort keys define
+  * the lexicographic order and per-key direction (ASC/DESC).
+  */
+//TODO(#3922): disallowing sorting on binary type
+class StableMergeSortOpDesc extends LogicalOp {
+
+  @JsonProperty(value = "keys", required = true)
+  @JsonSchemaTitle("Sort Keys")
+  @JsonPropertyDescription("List of attributes to sort by with ordering preferences")
+  var keys: ListBuffer[SortCriteriaUnit] = _
+
+  override def getPhysicalOp(
+      workflowId: WorkflowIdentity,
+      executionId: ExecutionIdentity
+  ): PhysicalOp = {
+    PhysicalOp
+      .manyToOnePhysicalOp(
+        workflowId,
+        executionId,
+        operatorIdentifier,
+        OpExecWithClassName(
+          "org.apache.texera.amber.operator.sort.StableMergeSortOpExec",
+          objectMapper.writeValueAsString(this)
+        )
+      )
+      .withInputPorts(operatorInfo.inputPorts)
+      .withOutputPorts(operatorInfo.outputPorts)
+  }
+
+  override def operatorInfo: OperatorInfo =
+    OperatorInfo(
+      "Stable Merge Sort",
+      "Stable per-partition sort with multi-key ordering (incremental stack of sorted buckets)",
+      OperatorGroupConstants.SORT_GROUP,
+      List(InputPort()),
+      List(OutputPort(blocking = true))
+    )
+}
diff --git a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExec.scala
new file mode 100644
index 00000000000..6b45f40c3eb
--- /dev/null
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExec.scala
@@ -0,0 +1,277 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.sort
+
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+
+import scala.collection.mutable.ArrayBuffer
+
+/**
+  * Stable in-memory merge sort for a single input partition.
+  *
+  * Strategy:
+  *  - Buffer incoming tuples as size-1 sorted buckets.
+  *  - Maintain a stack of buckets where adjacent buckets never share the same length.
+  *  - On each push, perform "binary-carry" merges while the top two buckets have equal sizes.
+  *  - At finish, collapse the stack left-to-right. Merging is stable (left wins on ties).
+  *
+  * Null policy:
+  *  - Nulls are always ordered last, regardless of ascending/descending per key.
+  */
+class StableMergeSortOpExec(descString: String) extends OperatorExecutor {
+
+  private val desc: StableMergeSortOpDesc =
+    objectMapper.readValue(descString, classOf[StableMergeSortOpDesc])
+
+  private var inputSchema: Schema = _
+
+  /** Sort key resolved against the schema (index, data type, and direction). */
+  private case class CompiledSortKey(
+      index: Int,
+      attributeType: AttributeType,
+      descending: Boolean
+  )
+
+  /** Lexicographic sort keys compiled once on first tuple. */
+  private var compiledSortKeys: Array[CompiledSortKey] = _
+
+  /** Stack of sorted buckets. Invariant: no two adjacent buckets have equal lengths. */
+  private var sortedBuckets: ArrayBuffer[ArrayBuffer[Tuple]] = _
+
+  /** Exposed for testing: current bucket sizes from bottom to top of the stack. */
+  private[sort] def debugBucketSizes: List[Int] =
+    if (sortedBuckets == null) Nil else sortedBuckets.filter(_ != null).map(_.size).toList
+
+  /** Initialize internal state. */
+  override def open(): Unit = {
+    sortedBuckets = ArrayBuffer.empty[ArrayBuffer[Tuple]]
+  }
+
+  /** Release internal buffers. */
+  override def close(): Unit = {
+    if (sortedBuckets != null) sortedBuckets.clear()
+  }
+
+  /**
+    * Ingest a tuple. Defers emission until onFinish.
+    *
+    * Schema compilation happens on the first tuple.
+    * Each tuple forms a size-1 sorted bucket that is pushed and possibly merged.
+    */
+  override def processTuple(tuple: Tuple, port: Int): Iterator[TupleLike] = {
+    if (inputSchema == null) {
+      inputSchema = tuple.getSchema
+      compiledSortKeys = compileSortKeys(inputSchema)
+    }
+    val sizeOneBucket = ArrayBuffer[Tuple](tuple)
+    pushBucketAndCombine(sizeOneBucket)
+    Iterator.empty
+  }
+
+  /**
+    * Emit all sorted tuples by collapsing the bucket stack left-to-right.
+    * Stability is preserved because merge prefers the left bucket on equality.
+    */
+  override def onFinish(port: Int): Iterator[TupleLike] = {
+    if (sortedBuckets.isEmpty) return Iterator.empty
+
+    var accumulator = sortedBuckets(0)
+    var bucketIdx = 1
+    while (bucketIdx < sortedBuckets.length) {
+      accumulator = mergeSortedBuckets(accumulator, sortedBuckets(bucketIdx))
+      bucketIdx += 1
+    }
+
+    sortedBuckets.clear()
+    sortedBuckets.append(accumulator)
+    accumulator.iterator
+  }
+
+  /**
+    * Resolve logical sort keys to schema indices and attribute types.
+    * Outputs an array of compiled sort keys used by [[compareBySortKeys]].
+    */
+  private def compileSortKeys(schema: Schema): Array[CompiledSortKey] = {
+    desc.keys.map { sortCriteria: SortCriteriaUnit =>
+      val name = sortCriteria.attributeName
+      val index = schema.getIndex(name)
+      val dataType = schema.getAttribute(name).getType
+      val isDescending = sortCriteria.sortPreference == SortPreference.DESC
+      CompiledSortKey(index, dataType, isDescending)
+    }.toArray
+  }
+
+  /**
+    * Push an already-sorted bucket and perform "binary-carry" merges while the
+    * top two buckets have equal sizes.
+    *
+    * Scope:
+    *  - Internal helper. Called by [[processTuple]] for size-1 buckets;
+    *
+    * Expected output:
+    *  - Updates the internal stack so that no two adjacent buckets have equal sizes.
+    *
+    * Limitations / possible issues:
+    *  - The given bucket must already be sorted by [[compareBySortKeys]].
+    *  - Stability relies on left-before-right merge order; do not reorder parameters.
+    *
+    * Complexity:
+    *  - Amortized O(1) per push; total O(n log n) over n tuples.
+    */
+  private[sort] def pushBucketAndCombine(newBucket: ArrayBuffer[Tuple]): Unit = {
+    sortedBuckets.append(newBucket)
+    // Merge while top two buckets are equal-sized; left-before-right preserves stability.
+    while (
+      sortedBuckets.length >= 2 &&
+      sortedBuckets(sortedBuckets.length - 1).size == sortedBuckets(sortedBuckets.length - 2).size
+    ) {
+      val right = sortedBuckets.remove(sortedBuckets.length - 1) // newer
+      val left = sortedBuckets.remove(sortedBuckets.length - 1) // older
+      val merged = mergeSortedBuckets(left, right)
+      sortedBuckets.append(merged)
+    }
+  }
+
+  /**
+    * Stable two-way merge of two buckets already sorted by [[compareBySortKeys]].
+    *
+    * Scope:
+    *  - Internal helper used during incremental carries and final collapse.
+    *
+    * Expected output:
+    *  - A new bucket with all elements of both inputs, globally sorted.
+    *
+    * Limitations / possible issues:
+    *  - Both inputs must be sorted with the same key config; behavior is undefined otherwise.
+    *  - Stability guarantee: if keys are equal, the element from the left bucket is emitted first.
+    *
+    * Complexity:
+    *  - O(left.size + right.size)
+    */
+  private[sort] def mergeSortedBuckets(
+      leftBucket: ArrayBuffer[Tuple],
+      rightBucket: ArrayBuffer[Tuple]
+  ): ArrayBuffer[Tuple] = {
+    val outMerged = new ArrayBuffer[Tuple](leftBucket.size + rightBucket.size)
+    var leftIndex = 0
+    var rightIndex = 0
+    while (leftIndex < leftBucket.size && rightIndex < rightBucket.size) {
+      if (compareBySortKeys(leftBucket(leftIndex), rightBucket(rightIndex)) <= 0) {
+        outMerged += leftBucket(leftIndex); leftIndex += 1
+      } else {
+        outMerged += rightBucket(rightIndex); rightIndex += 1
+      }
+    }
+    while (leftIndex < leftBucket.size) { outMerged += leftBucket(leftIndex); leftIndex += 1 }
+    while (rightIndex < rightBucket.size) { outMerged += rightBucket(rightIndex); rightIndex += 1 }
+    outMerged
+  }
+
+  /**
+    * Lexicographic comparison of two tuples using the compiled sort keys.
+    *
+    * Semantics:
+    *  - Nulls are always ordered last, regardless of sort direction.
+    *  - For non-null values, comparison is type-aware (see [[compareTypedNonNullValues]]).
+    *  - If a key compares equal, evaluation proceeds to the next key.
+    *  - Descending reverses the sign of the base comparison.
+    *
+    * Limitations / possible issues:
+    *  - Requires [[compiledSortKeys]] to be initialized; called after the first tuple.
+    *  - For unsupported types, [[compareTypedNonNullValues]] throws IllegalStateException.
+    */
+  private def compareBySortKeys(left: Tuple, right: Tuple): Int = {
+    var keyIndex = 0
+    while (keyIndex < compiledSortKeys.length) {
+      val currentKey = compiledSortKeys(keyIndex)
+      val leftValue = left.getField[Any](currentKey.index)
+      val rightValue = right.getField[Any](currentKey.index)
+
+      // Null policy: ALWAYS last, regardless of ASC/DESC
+      if (leftValue == null || rightValue == null) {
+        if (leftValue == null && rightValue == null) {
+          keyIndex += 1
+        } else {
+          return if (leftValue == null) 1 else -1
+        }
+      } else {
+        val base = compareTypedNonNullValues(leftValue, rightValue, currentKey.attributeType)
+        if (base != 0) return if (currentKey.descending) -base else base
+        keyIndex += 1
+      }
+    }
+    0
+  }
+
+  /**
+    * Compare two non-null values using their attribute type.
+    *
+    * Type semantics:
+    *  - INTEGER, LONG: numeric ascending via Java primitive compares.
+    *  - DOUBLE: java.lang.Double.compare (orders -Inf < ... < +Inf < NaN).
+    *  - BOOLEAN: false < true.
+    *  - TIMESTAMP: java.sql.Timestamp#compareTo.
+    *  - STRING: String#compareTo (UTF-16, lexicographic).
+    *  - BINARY: unsigned lexicographic order over byte arrays:
+    *        - Compare byte-by-byte treating each as 0..255 (mask 0xff).
+    *        - The first differing byte decides the order.
+    *        - If all compared bytes are equal, the shorter array sorts first.
+    *        - Example: [] < [0x00] < [0x00,0x00] < [0x00,0x01] < [0x7F] < [0x80] < [0xFF].
+    */
+  private def compareTypedNonNullValues(
+      leftValue: Any,
+      rightValue: Any,
+      attrType: AttributeType
+  ): Int =
+    attrType match {
+      case AttributeType.INTEGER =>
+        java.lang.Integer.compare(
+          leftValue.asInstanceOf[Number].intValue(),
+          rightValue.asInstanceOf[Number].intValue()
+        )
+      case AttributeType.LONG =>
+        java.lang.Long.compare(
+          leftValue.asInstanceOf[Number].longValue(),
+          rightValue.asInstanceOf[Number].longValue()
+        )
+      case AttributeType.DOUBLE =>
+        java.lang.Double.compare(
+          leftValue.asInstanceOf[Number].doubleValue(),
+          rightValue.asInstanceOf[Number].doubleValue()
+        )
+      case AttributeType.BOOLEAN =>
+        java.lang.Boolean.compare(leftValue.asInstanceOf[Boolean], rightValue.asInstanceOf[Boolean])
+      case AttributeType.TIMESTAMP =>
+        leftValue
+          .asInstanceOf[java.sql.Timestamp]
+          .compareTo(rightValue.asInstanceOf[java.sql.Timestamp])
+      case AttributeType.STRING =>
+        leftValue.asInstanceOf[String].compareTo(rightValue.asInstanceOf[String])
+      case AttributeType.BINARY =>
+        java.util.Arrays.compareUnsigned(
+          leftValue.asInstanceOf[Array[Byte]],
+          rightValue.asInstanceOf[Array[Byte]]
+        )
+      case other =>
+        throw new IllegalStateException(s"Unsupported attribute type $other in StableMergeSort")
+    }
+}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpDesc.scala
similarity index 79%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpDesc.scala
index bd02445fabb..9290d549f2e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpDesc.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sortPartitions
+package org.apache.texera.amber.operator.sortPartitions
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, RangePartition}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, RangePartition}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 @JsonSchemaInject(json = """
 {
@@ -67,7 +66,7 @@ class SortPartitionsOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.sortPartitions.SortPartitionsOpExec",
+          "org.apache.texera.amber.operator.sortPartitions.SortPartitionsOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExec.scala
similarity index 64%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExec.scala
index d4080779d40..86052f13a23 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sortPartitions
+package org.apache.texera.amber.operator.sortPartitions
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.collection.mutable.ArrayBuffer
 
@@ -47,18 +47,11 @@ class SortPartitionsOpExec(descString: String) extends OperatorExecutor {
 
   override def onFinish(port: Int): Iterator[TupleLike] = sortTuples()
 
-  private def compareTuples(t1: Tuple, t2: Tuple): Boolean = {
-    val attributeType = t1.getSchema.getAttribute(desc.sortAttributeName).getType
-    val attributeIndex = t1.getSchema.getIndex(desc.sortAttributeName)
-    attributeType match {
-      case AttributeType.LONG =>
-        t1.getField[Long](attributeIndex) < t2.getField[Long](attributeIndex)
-      case AttributeType.INTEGER =>
-        t1.getField[Int](attributeIndex) < t2.getField[Int](attributeIndex)
-      case AttributeType.DOUBLE =>
-        t1.getField[Double](attributeIndex) < t2.getField[Double](attributeIndex)
-      case _ =>
-        true // unsupported type
-    }
-  }
+  private def compareTuples(tuple1: Tuple, tuple2: Tuple): Boolean =
+    AttributeTypeUtils.compare(
+      tuple1.getField[Any](tuple1.getSchema.getIndex(desc.sortAttributeName)),
+      tuple2.getField[Any](tuple2.getSchema.getIndex(desc.sortAttributeName)),
+      tuple1.getSchema.getAttribute(desc.sortAttributeName).getType
+    ) < 0
+
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/BufferedBlockReader.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/BufferedBlockReader.java
similarity index 98%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/BufferedBlockReader.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/BufferedBlockReader.java
index d5ed8420ade..7883841c8cd 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/BufferedBlockReader.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/BufferedBlockReader.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source;
+package org.apache.texera.amber.operator.source;
 
 import com.google.common.primitives.Ints;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/PythonSourceOperatorDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/PythonSourceOperatorDescriptor.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/PythonSourceOperatorDescriptor.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/PythonSourceOperatorDescriptor.scala
index edda627403d..4221352dfca 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/PythonSourceOperatorDescriptor.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/PythonSourceOperatorDescriptor.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source
+package org.apache.texera.amber.operator.source
 
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
 
 abstract class PythonSourceOperatorDescriptor
     extends SourceOperatorDescriptor
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/SourceOperatorDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/SourceOperatorDescriptor.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/SourceOperatorDescriptor.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/SourceOperatorDescriptor.scala
index 365d6a636d1..5e9a9c7dd46 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/SourceOperatorDescriptor.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/SourceOperatorDescriptor.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source
+package org.apache.texera.amber.operator.source
 
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.operator.LogicalOp
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.operator.LogicalOp
 
 abstract class SourceOperatorDescriptor extends LogicalOp {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala
index 2e68360d3b8..adaef827180 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.reddit
+package org.apache.texera.amber.operator.source.apis.reddit
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.PythonSourceOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.{OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.{OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.PythonSourceOperatorDescriptor
 
 class RedditSearchSourceOpDesc extends PythonSourceOperatorDescriptor {
   @JsonProperty(required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java
index 1cf9537f92a..4dc4822ea8a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.reddit;
+package org.apache.texera.amber.operator.source.apis.reddit;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala
index d71701bfea6..d65bb12451b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter
+package org.apache.texera.amber.operator.source.apis.twitter
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaDescription, JsonSchemaTitle}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.workflow.OutputPort
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
 
 abstract class TwitterSourceOpDesc extends SourceOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala
index bd8c8321087..aff988b2359 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter
+package org.apache.texera.amber.operator.source.apis.twitter
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
 import io.github.redouane59.twitter.TwitterClient
 import io.github.redouane59.twitter.signature.TwitterCredentials
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 abstract class TwitterSourceOpExec(
     descString: String
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala
index e3f06c21a18..6c3c74d3cd7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter.v2
+package org.apache.texera.amber.operator.source.apis.twitter.v2
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty}
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaInject,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.annotations.UIWidget
-import edu.uci.ics.amber.operator.source.apis.twitter.TwitterSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.annotations.UIWidget
+import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class TwitterFullArchiveSearchSourceOpDesc extends TwitterSourceOpDesc {
 
@@ -70,7 +70,7 @@ class TwitterFullArchiveSearchSourceOpDesc extends TwitterSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.apis.twitter.v2.TwitterFullArchiveSearchSourceOpExec",
+          "org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterFullArchiveSearchSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala
index c3df3a7ba63..46053543b1c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter.v2
+package org.apache.texera.amber.operator.source.apis.twitter.v2
 
-import edu.uci.ics.amber.core.tuple.{Schema, Tuple, TupleLike}
-import edu.uci.ics.amber.operator.source.apis.twitter.TwitterSourceOpExec
-import edu.uci.ics.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
 import io.github.redouane59.twitter.dto.endpoints.AdditionalParameters
 import io.github.redouane59.twitter.dto.tweet.TweetList
 import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData
 import io.github.redouane59.twitter.dto.user.UserV2.UserData
+import org.apache.texera.amber.core.tuple.{Schema, Tuple, TupleLike}
+import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpExec
+import org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala
index 3b44cbbe214..8b6976f4f2c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter.v2
+package org.apache.texera.amber.operator.source.apis.twitter.v2
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty}
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaInject,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.annotations.UIWidget
-import edu.uci.ics.amber.operator.source.apis.twitter.TwitterSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.annotations.UIWidget
+import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class TwitterSearchSourceOpDesc extends TwitterSourceOpDesc {
 
@@ -60,7 +60,7 @@ class TwitterSearchSourceOpDesc extends TwitterSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.apis.twitter.v2.TwitterSearchSourceOpExec",
+          "org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterSearchSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala
index 273b7eba052..95046646871 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter.v2
+package org.apache.texera.amber.operator.source.apis.twitter.v2
 
-import edu.uci.ics.amber.core.tuple.{Schema, Tuple, TupleLike}
-import edu.uci.ics.amber.operator.source.apis.twitter.TwitterSourceOpExec
-import edu.uci.ics.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
 import io.github.redouane59.twitter.dto.endpoints.AdditionalParameters
 import io.github.redouane59.twitter.dto.tweet.TweetList
 import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData
 import io.github.redouane59.twitter.dto.user.UserV2.UserData
+import org.apache.texera.amber.core.tuple.{Schema, Tuple, TupleLike}
+import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpExec
+import org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.collection.mutable.ListBuffer
 import scala.collection.{Iterator, mutable}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterUtils.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterUtils.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterUtils.scala
index a806ca8ebcf..a1fc6dd7d69 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterUtils.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterUtils.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.apis.twitter.v2
+package org.apache.texera.amber.operator.source.apis.twitter.v2
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, Tuple}
 import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData
 import io.github.redouane59.twitter.dto.user.UserV2.UserData
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, Tuple}
 
 import java.time.format.DateTimeFormatter
 import java.time.{ZoneId, ZoneOffset}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/cache/CacheSourceOpExec.scala
similarity index 79%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/cache/CacheSourceOpExec.scala
index 374c8eba715..b1f76489eb9 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/cache/CacheSourceOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.cache
+package org.apache.texera.amber.operator.source.cache
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.model.VirtualDocument
-import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSResourceType, VFSURIFactory}
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.model.VirtualDocument
+import org.apache.texera.amber.core.storage.{DocumentFactory, VFSResourceType, VFSURIFactory}
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 import java.net.URI
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/DecodingMethod.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/DecodingMethod.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/DecodingMethod.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/DecodingMethod.java
index e1a25498916..a9c7879672c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/DecodingMethod.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/DecodingMethod.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.fetcher;
+package org.apache.texera.amber.operator.source.fetcher;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/RandomUserAgent.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/RandomUserAgent.java
similarity index 99%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/RandomUserAgent.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/RandomUserAgent.java
index 48d2faac233..7be21fea74e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/RandomUserAgent.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/RandomUserAgent.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.fetcher;
+package org.apache.texera.amber.operator.source.fetcher;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetchUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetchUtil.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetchUtil.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetchUtil.scala
index 1800a24d1ad..443e12be301 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetchUtil.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetchUtil.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.fetcher
+package org.apache.texera.amber.operator.source.fetcher
 
 import java.io.InputStream
 import java.net.URL
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpDesc.scala
similarity index 78%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpDesc.scala
index cea5e2e9939..01f6ddc5234 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpDesc.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.fetcher
+package org.apache.texera.amber.operator.source.fetcher
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class URLFetcherOpDesc extends SourceOperatorDescriptor {
 
@@ -64,7 +63,7 @@ class URLFetcherOpDesc extends SourceOperatorDescriptor {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.fetcher.URLFetcherOpExec",
+          "org.apache.texera.amber.operator.source.fetcher.URLFetcherOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExec.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExec.scala
index 8c4a42cbca0..3f7b45421a2 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.fetcher
+package org.apache.texera.amber.operator.source.fetcher
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.operator.source.fetcher.URLFetchUtil.getInputStreamFromURL
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.tuple.TupleLike
+import org.apache.texera.amber.operator.source.fetcher.URLFetchUtil.getInputStreamFromURL
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.apache.commons.io.IOUtils
 
 import java.net.URL
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/AutoClosingIterator.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/AutoClosingIterator.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/AutoClosingIterator.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/AutoClosingIterator.scala
index 3f392feaea8..df6a24dbf47 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/AutoClosingIterator.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/AutoClosingIterator.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan
+package org.apache.texera.amber.operator.source.scan
 
 /**
   * A wrapper around an Interator that automatically invokes a cleanup function
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileAttributeType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileAttributeType.java
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileAttributeType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileAttributeType.java
index 29b2527192c..87d6c38c64d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileAttributeType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileAttributeType.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan;
+package org.apache.texera.amber.operator.source.scan;
 
 import com.fasterxml.jackson.annotation.JsonValue;
-import edu.uci.ics.amber.core.tuple.AttributeType;
+import org.apache.texera.amber.core.tuple.AttributeType;
 
 public enum FileAttributeType {
     STRING("string", AttributeType.STRING),
@@ -30,7 +30,8 @@ public enum FileAttributeType {
     DOUBLE("double", AttributeType.DOUBLE),
     BOOLEAN("boolean", AttributeType.BOOLEAN),
     TIMESTAMP("timestamp", AttributeType.TIMESTAMP),
-    BINARY("binary", AttributeType.BINARY);
+    BINARY("binary", AttributeType.BINARY),
+    LARGE_BINARY("large binary", AttributeType.LARGE_BINARY);
 
 
     private final String name;
@@ -56,6 +57,6 @@ public String toString() {
     }
 
     public boolean isSingle() {
-        return this == SINGLE_STRING || this == BINARY;
+        return this == SINGLE_STRING || this == BINARY || this == LARGE_BINARY;
     }
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileDecodingMethod.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileDecodingMethod.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileDecodingMethod.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileDecodingMethod.java
index 8c6cacdaa89..2cd3ecb7e70 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileDecodingMethod.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileDecodingMethod.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan;
+package org.apache.texera.amber.operator.source.scan;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpDesc.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpDesc.scala
index 8e288c7fa43..a76a855cade 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan
+package org.apache.texera.amber.operator.source.scan
 
 import com.fasterxml.jackson.annotation.{JsonIgnoreProperties, JsonProperty}
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaString,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation
-import edu.uci.ics.amber.operator.source.scan.text.TextSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation
+import org.apache.texera.amber.operator.source.scan.text.TextSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 @JsonIgnoreProperties(value = Array("limit", "offset", "fileEncoding"))
 class FileScanSourceOpDesc extends ScanSourceOpDesc with TextSourceOpDesc {
@@ -73,7 +73,7 @@ class FileScanSourceOpDesc extends ScanSourceOpDesc with TextSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.FileScanSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.FileScanSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExec.scala
similarity index 77%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExec.scala
index 8bf040f64d9..91c817240cc 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExec.scala
@@ -17,20 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan
+package org.apache.texera.amber.operator.source.scan
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.parseField
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField
+import org.apache.texera.amber.core.tuple.{LargeBinary, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.service.util.LargeBinaryOutputStream
+import org.apache.commons.compress.archivers.ArchiveStreamFactory
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
 import org.apache.commons.io.IOUtils.toByteArray
+
 import java.io._
 import java.net.URI
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.IteratorHasAsScala
-import org.apache.commons.compress.archivers.ArchiveStreamFactory
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
 
 class FileScanSourceOpExec private[scan] (
     descString: String
@@ -83,6 +85,21 @@ class FileScanSourceOpExec private[scan] (
             fields.addOne(desc.attributeType match {
               case FileAttributeType.SINGLE_STRING =>
                 new String(toByteArray(entry), desc.fileEncoding.getCharset)
+              case FileAttributeType.LARGE_BINARY =>
+                // For large binaries, create reference and upload via streaming
+                val largeBinary = new LargeBinary()
+                val out = new LargeBinaryOutputStream(largeBinary)
+                try {
+                  val buffer = new Array[Byte](8192)
+                  var bytesRead = entry.read(buffer)
+                  while (bytesRead != -1) {
+                    out.write(buffer, 0, bytesRead)
+                    bytesRead = entry.read(buffer)
+                  }
+                } finally {
+                  out.close()
+                }
+                largeBinary
               case _ => parseField(toByteArray(entry), desc.attributeType.getType)
             })
             TupleLike(fields.toSeq: _*)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/ScanSourceOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/ScanSourceOpDesc.scala
index 42490188077..6c1c2c5fbd3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/ScanSourceOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan
+package org.apache.texera.amber.operator.source.scan
 
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.storage.FileResolver
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.workflow.OutputPort
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
 import org.apache.commons.lang3.builder.EqualsBuilder
 
 import java.net.URI
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala
similarity index 78%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala
index b0bbfd10084..ac43dbe65dd 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala
@@ -17,26 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.arrow
+package org.apache.texera.amber.operator.source.scan.arrow
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.util.ArrowUtils
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-
-import java.io.IOException
-import java.net.URI
-import java.nio.file.Files
-import java.nio.file.StandardOpenOption
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
+import org.apache.texera.amber.util.ArrowUtils
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.apache.arrow.memory.RootAllocator
 import org.apache.arrow.vector.ipc.ArrowFileReader
 import org.apache.arrow.vector.types.pojo.{Schema => ArrowSchema}
 
+import java.io.IOException
+import java.net.URI
+import java.nio.file.{Files, StandardOpenOption}
 import scala.util.Using
 
 @JsonIgnoreProperties(value = Array("fileEncoding"))
@@ -55,7 +53,7 @@ class ArrowSourceOpDesc extends ScanSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.arrow.ArrowSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.arrow.ArrowSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala
index 6b3b185de8b..f23833206f9 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.arrow
+package org.apache.texera.amber.operator.source.scan.arrow
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.util.ArrowUtils
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.TupleLike
+import org.apache.texera.amber.util.ArrowUtils
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.apache.arrow.memory.RootAllocator
 import org.apache.arrow.vector.VectorSchemaRoot
 import org.apache.arrow.vector.ipc.ArrowFileReader
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala
index c1fe63cc6ba..9879835e763 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csv
+package org.apache.texera.amber.operator.source.scan.csv
 
 import com.fasterxml.jackson.annotation.{JsonInclude, JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
 import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.io.{IOException, InputStreamReader}
 import java.net.URI
@@ -65,7 +65,7 @@ class CSVScanSourceOpDesc extends ScanSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala
index 968744094d3..c3fbbe9bb55 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csv
+package org.apache.texera.amber.operator.source.scan.csv
 
 import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings}
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.{AttributeTypeUtils, Schema, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Schema, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.io.InputStreamReader
 import java.net.URI
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala
index a88b8066f08..b159e59c3e6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csv
+package org.apache.texera.amber.operator.source.scan.csv
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.io.IOException
 import java.net.URI
@@ -66,7 +66,7 @@ class ParallelCSVScanSourceOpDesc extends ScanSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.csv.ParallelCSVScanSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.csv.ParallelCSVScanSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala
index 7d1ce6427b8..1c9377e564e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csv
+package org.apache.texera.amber.operator.source.scan.csv
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeTypeUtils, TupleLike}
-import edu.uci.ics.amber.operator.source.BufferedBlockReader
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeTypeUtils, TupleLike}
+import org.apache.texera.amber.operator.source.BufferedBlockReader
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.tukaani.xz.SeekableFileInputStream
 
 import java.net.URI
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala
index 836e87a99e0..08b5ea1ce10 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csvOld
+package org.apache.texera.amber.operator.source.scan.csvOld
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.io.IOException
 import java.net.URI
@@ -63,7 +63,7 @@ class CSVOldScanSourceOpDesc extends ScanSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.csvOld.CSVOldScanSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.csvOld.CSVOldScanSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala
index ddde2307ead..e7b1e938c35 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csvOld
+package org.apache.texera.amber.operator.source.scan.csvOld
 
 import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat}
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.net.URI
 import scala.collection.compat.immutable.ArraySeq
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala
index aa9723bd5fd..2d86052fa58 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.json
+package org.apache.texera.amber.operator.source.scan.json
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.JsonNode
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.{JSONToMap, objectMapper}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.{JSONToMap, objectMapper}
 
 import java.io._
 import java.net.URI
@@ -55,7 +55,7 @@ class JSONLScanSourceOpDesc extends ScanSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.json.JSONLScanSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.json.JSONLScanSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
index f96145b4cdf..c96278c3e3d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.json
+package org.apache.texera.amber.operator.source.scan.json
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.storage.DocumentFactory
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.parseField
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.operator.source.scan.json.JSONUtil.JSONToMap
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.storage.DocumentFactory
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField
+import org.apache.texera.amber.core.tuple.TupleLike
+import org.apache.texera.amber.operator.source.scan.json.JSONUtil.JSONToMap
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.io.{BufferedReader, InputStreamReader}
 import java.net.URI
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala
similarity index 98%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONUtil.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala
index 469b1bebbdb..d5c7f2b4e48 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONUtil.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.json
+package org.apache.texera.amber.operator.source.scan.json
 
 import com.fasterxml.jackson.databind.JsonNode
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDesc.scala
similarity index 74%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDesc.scala
index 866cd5934eb..cfb14940f43 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDesc.scala
@@ -17,19 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.text
+package org.apache.texera.amber.operator.source.scan.text
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.UIWidget
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.annotations.UIWidget
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class TextInputSourceOpDesc extends SourceOperatorDescriptor with TextSourceOpDesc {
   @JsonProperty(required = true)
@@ -47,7 +46,7 @@ class TextInputSourceOpDesc extends SourceOperatorDescriptor with TextSourceOpDe
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.scan.text.TextInputSourceOpExec",
+          "org.apache.texera.amber.operator.source.scan.text.TextInputSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpExec.scala
similarity index 81%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpExec.scala
index 3624da1a7b8..8ade443ef9b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpExec.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.text
+package org.apache.texera.amber.operator.source.scan.text
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.parseField
-import edu.uci.ics.amber.core.tuple.TupleLike
-import edu.uci.ics.amber.operator.source.scan.FileAttributeType
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField
+import org.apache.texera.amber.core.tuple.TupleLike
+import org.apache.texera.amber.operator.source.scan.FileAttributeType
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class TextInputSourceOpExec private[text] (
     descString: String
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextSourceOpDesc.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextSourceOpDesc.scala
index 26824fb3a16..afa4a3604c0 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextSourceOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.text
+package org.apache.texera.amber.operator.source.scan.text
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
@@ -26,8 +26,8 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaString,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation
-import edu.uci.ics.amber.operator.source.scan.FileAttributeType
+import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation
+import org.apache.texera.amber.operator.source.scan.FileAttributeType
 
 /**
   * TextSourceOpDesc is a trait holding commonly used properties and functions used for variations of text input processing
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/SQLSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpDesc.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/SQLSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpDesc.scala
index 873a683a9a4..4cccd0ff2ad 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/SQLSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpDesc.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql
+package org.apache.texera.amber.operator.source.sql
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   BatchByColumn,
   EnablePresets,
   UIWidget
 }
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
 
 import java.sql._
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/SQLSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpExec.scala
similarity index 98%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/SQLSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpExec.scala
index 10617321261..be04ba2a46d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/SQLSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql
+package org.apache.texera.amber.operator.source.sql
 
-import edu.uci.ics.amber.core.executor.SourceOperatorExecutor
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.{parseField, parseTimestamp}
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.SourceOperatorExecutor
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.{parseField, parseTimestamp}
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.sql._
 import scala.collection.mutable.ArrayBuffer
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala
similarity index 98%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala
index c7f7a176ab7..1cdf9026dbf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.asterixdb
+package org.apache.texera.amber.operator.source.sql.asterixdb
 
 import kong.unirest.json.JSONObject
 import kong.unirest.{HttpResponse, JsonNode, Unirest}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala
index f39dfaed7b4..8a679fd2b41 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.asterixdb
+package org.apache.texera.amber.operator.source.sql.asterixdb
 
 import com.fasterxml.jackson.annotation.{
   JsonIgnoreProperties,
@@ -26,25 +26,24 @@ import com.fasterxml.jackson.annotation.{
 }
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
-import edu.uci.ics.amber.operator.filter.FilterPredicate
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import kong.unirest.json.JSONObject
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.filter.FilterPredicate
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   AutofillAttributeNameList,
   UIWidget
 }
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.sql.SQLSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.sql.SQLSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{
   fetchDataTypeFields,
   queryAsterixDB
 }
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import kong.unirest.json.JSONObject
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 @JsonIgnoreProperties(value = Array("username", "password"))
 class AsterixDBSourceOpDesc extends SQLSourceOpDesc {
@@ -118,7 +117,7 @@ class AsterixDBSourceOpDesc extends SQLSourceOpDesc {
         executionId,
         this.operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.sql.asterixdb.AsterixDBSourceOpExec",
+          "org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala
index 78f386d3eb3..c82dcfe2e06 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.asterixdb
+package org.apache.texera.amber.operator.source.sql.asterixdb
 
 import com.github.tototoshi.csv.CSVParser
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.parseField
-import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple, TupleLike}
-import edu.uci.ics.amber.operator.source.sql.SQLSourceOpExec
-import edu.uci.ics.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField
+import org.apache.texera.amber.core.tuple.{AttributeType, Tuple, TupleLike}
+import org.apache.texera.amber.operator.source.sql.SQLSourceOpExec
+import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{
   queryAsterixDB,
   updateAsterixDBVersionMapping
 }
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.sql._
 import java.time.format.DateTimeFormatter
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLConnUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLConnUtil.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLConnUtil.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLConnUtil.scala
index 736a92ed8f2..3e1ea938263 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLConnUtil.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLConnUtil.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.mysql
+package org.apache.texera.amber.operator.source.sql.mysql
 
 import java.sql.{Connection, DriverManager, SQLException}
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala
similarity index 73%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala
index 155b9f13eb2..92b1d4e0931 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala
@@ -17,16 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.mysql
+package org.apache.texera.amber.operator.source.sql.mysql
 
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.sql.SQLSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.mysql.MySQLConnUtil.connect
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.sql.SQLSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.mysql.MySQLConnUtil.connect
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.sql.{Connection, SQLException}
 
@@ -42,7 +41,7 @@ class MySQLSourceOpDesc extends SQLSourceOpDesc {
         executionId,
         this.operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.sql.mysql.MySQLSourceOpExec",
+          "org.apache.texera.amber.operator.source.sql.mysql.MySQLSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala
index 487c0541eb6..c7b0eaf6e2c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.mysql
+package org.apache.texera.amber.operator.source.sql.mysql
 
-import edu.uci.ics.amber.core.tuple.AttributeType
-import edu.uci.ics.amber.operator.source.sql.SQLSourceOpExec
-import edu.uci.ics.amber.operator.source.sql.mysql.MySQLConnUtil.connect
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.AttributeType
+import org.apache.texera.amber.operator.source.sql.SQLSourceOpExec
+import org.apache.texera.amber.operator.source.sql.mysql.MySQLConnUtil.connect
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.sql._
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala
index 796199c538b..c6fb4ff7922 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.postgresql
+package org.apache.texera.amber.operator.source.sql.postgresql
 
 import java.sql.{Connection, DriverManager, SQLException}
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala
similarity index 76%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala
index cadac3c06ad..0d13179aef7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala
@@ -17,20 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.postgresql
+package org.apache.texera.amber.operator.source.sql.postgresql
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.UIWidget
-import edu.uci.ics.amber.operator.source.sql.SQLSourceOpDesc
-import edu.uci.ics.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.annotations.UIWidget
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.sql.SQLSourceOpDesc
+import org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.sql.{Connection, SQLException}
 
@@ -55,7 +54,7 @@ class PostgreSQLSourceOpDesc extends SQLSourceOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.source.sql.postgresql.PostgreSQLSourceOpExec",
+          "org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLSourceOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala
index c379c3c8af7..4ce3a34cddd 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.sql.postgresql
+package org.apache.texera.amber.operator.source.sql.postgresql
 
-import edu.uci.ics.amber.core.tuple.AttributeType
-import edu.uci.ics.amber.operator.source.sql.SQLSourceOpExec
-import edu.uci.ics.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.AttributeType
+import org.apache.texera.amber.operator.source.sql.SQLSourceOpExec
+import org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import java.sql._
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpDesc.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpDesc.scala
index 74eb8c65ad3..0cd9d68b1cb 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.split
+package org.apache.texera.amber.operator.split
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.google.common.base.Preconditions
@@ -26,13 +26,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaString,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class SplitOpDesc extends LogicalOp {
 
@@ -68,7 +68,7 @@ class SplitOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.split.SplitOpExec",
+          "org.apache.texera.amber.operator.split.SplitOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpExec.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpExec.scala
index b3aaaeb0216..3d3e8690917 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpExec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.split
+package org.apache.texera.amber.operator.split
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 import scala.util.Random
 
diff --git a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpDesc.scala
new file mode 100644
index 00000000000..da4a7437b93
--- /dev/null
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpDesc.scala
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.substringSearch
+
+import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
+import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp}
+import org.apache.texera.amber.operator.filter.FilterOpDesc
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+
+class SubstringSearchOpDesc extends FilterOpDesc {
+
+  @JsonProperty(required = true)
+  @JsonSchemaTitle("attribute")
+  @JsonPropertyDescription("column to search substring on")
+  @AutofillAttributeName
+  var attribute: String = _
+
+  @JsonProperty(required = true)
+  @JsonSchemaTitle("Substring")
+  @JsonPropertyDescription("substring")
+  var substring: String = _
+
+  @JsonProperty(required = true, defaultValue = "false")
+  @JsonSchemaTitle("Case Sensitive")
+  @JsonPropertyDescription("Whether the substring match is case sensitive.")
+  var isCaseSensitive: Boolean = false
+
+  override def getPhysicalOp(
+      workflowId: WorkflowIdentity,
+      executionId: ExecutionIdentity
+  ): PhysicalOp = {
+    PhysicalOp
+      .oneToOnePhysicalOp(
+        workflowId,
+        executionId,
+        operatorIdentifier,
+        OpExecWithClassName(
+          "org.apache.texera.amber.operator.substringSearch.SubstringSearchOpExec",
+          objectMapper.writeValueAsString(this)
+        )
+      )
+      .withInputPorts(operatorInfo.inputPorts)
+      .withOutputPorts(operatorInfo.outputPorts)
+  }
+
+  override def operatorInfo: OperatorInfo =
+    OperatorInfo(
+      userFriendlyName = "Substring Search",
+      operatorDescription = "Search for Substring(s) in a string column",
+      operatorGroupName = OperatorGroupConstants.SEARCH_GROUP,
+      inputPorts = List(InputPort()),
+      outputPorts = List(OutputPort()),
+      supportReconfiguration = true
+    )
+}
diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpExec.scala
similarity index 53%
rename from core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpExec.scala
index b20c74cb282..5331a4601d0 100644
--- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpExec.scala
@@ -17,27 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.engine.e2e
+package org.apache.texera.amber.operator.substringSearch
 
-import edu.uci.ics.amber.core.workflow.WorkflowContext
-import edu.uci.ics.amber.engine.architecture.controller.Workflow
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo
-import edu.uci.ics.texera.workflow.{LogicalLink, WorkflowCompiler}
+import org.apache.texera.amber.core.tuple.Tuple
+import org.apache.texera.amber.operator.filter.FilterOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
-object TestUtils {
+class SubstringSearchOpExec(descString: String) extends FilterOpExec {
+  private val desc: SubstringSearchOpDesc =
+    objectMapper.readValue(descString, classOf[SubstringSearchOpDesc])
 
-  def buildWorkflow(
-      operators: List[LogicalOp],
-      links: List[LogicalLink],
-      context: WorkflowContext
-  ): Workflow = {
-    val workflowCompiler = new WorkflowCompiler(
-      context
-    )
-    workflowCompiler.compile(
-      LogicalPlanPojo(operators, links, List(), List())
-    )
-  }
+  this.setFilterFunc(findSubstring)
 
+  private def findSubstring(tuple: Tuple): Boolean = {
+    val content = tuple.getField(desc.attribute).toString
+    if (desc.isCaseSensitive) {
+      content.contains(desc.substring)
+    } else {
+      content.toLowerCase.contains(desc.substring.toLowerCase)
+    }
+  }
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala
similarity index 79%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala
index 16e19478371..d0d6deecbe6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala
@@ -17,21 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.symmetricDifference
+package org.apache.texera.amber.operator.symmetricDifference
 
 import com.google.common.base.Preconditions
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.workflow.{
-  HashPartition,
-  InputPort,
-  OutputPort,
-  PhysicalOp,
-  PortIdentity,
-  SchemaPropagationFunc
-}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class SymmetricDifferenceOpDesc extends LogicalOp {
 
@@ -46,7 +39,7 @@ class SymmetricDifferenceOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.symmetricDifference.SymmetricDifferenceOpExec"
+          "org.apache.texera.amber.operator.symmetricDifference.SymmetricDifferenceOpExec"
         )
       )
       .withInputPorts(operatorInfo.inputPorts)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala
index 87250689576..518dc984ceb 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.symmetricDifference
+package org.apache.texera.amber.operator.symmetricDifference
+
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
 import scala.collection.mutable
 
 class SymmetricDifferenceOpExec extends OperatorExecutor {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala
index 24b394a0722..aae1c339331 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala
@@ -16,16 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.uci.ics.amber.operator.visualization.timeSeriesplot
+package org.apache.texera.amber.operator.visualization.timeSeriesplot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.{NotBlank, NotNull}
 
 class TimeSeriesOpDesc extends PythonOperatorDescriptor {
 
@@ -33,6 +35,7 @@ class TimeSeriesOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Time Column")
   @JsonPropertyDescription("The column containing time/date values (e.g., Date, Timestamp).")
   @AutofillAttributeName
+  @NotNull(message = "Time Column cannot be empty")
   var timeColumn: String = ""
 
   @JsonProperty(value = "valueColumn", required = true)
@@ -40,6 +43,7 @@ class TimeSeriesOpDesc extends PythonOperatorDescriptor {
   @JsonPropertyDescription("The numerical column to plot on the Y-axis (e.g., Sales, Temperature).")
   @JsonSchemaInject(json = """{"enum": "autofill"}""")
   @AutofillAttributeName
+  @NotNull(message = "Value Column cannot be empty")
   var valueColumn: String = ""
 
   @JsonProperty(value = "categoryColumn", required = false, defaultValue = "No Selection")
@@ -57,6 +61,7 @@ class TimeSeriesOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "line", defaultValue = "line", required = true)
   @JsonSchemaTitle("Plot Type")
   @JsonPropertyDescription("Select the type of time series plot (line, area).")
+  @NotBlank(message = "Plot Type cannot be empty")
   var plotType: String = "line"
 
   @JsonProperty(value = "slider", defaultValue = "false")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpDesc.scala
similarity index 77%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpDesc.scala
index 62c5bb9e8be..82b0af60b36 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpDesc.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.typecasting
+package org.apache.texera.amber.operator.typecasting
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeTypeUtils, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.map.MapOpDesc
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.map.MapOpDesc
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class TypeCastingOpDesc extends MapOpDesc {
 
@@ -48,7 +47,7 @@ class TypeCastingOpDesc extends MapOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.typecasting.TypeCastingOpExec",
+          "org.apache.texera.amber.operator.typecasting.TypeCastingOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExec.scala
similarity index 83%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExec.scala
index a3af23d4e23..3390784ef45 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.typecasting
+package org.apache.texera.amber.operator.typecasting
 
-import edu.uci.ics.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike}
-import edu.uci.ics.amber.operator.map.MapOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike}
+import org.apache.texera.amber.operator.map.MapOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class TypeCastingOpExec(descString: String) extends MapOpExec {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingUnit.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingUnit.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingUnit.java
index efe4a12a99b..2e942cf3232 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingUnit.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingUnit.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.typecasting;
+package org.apache.texera.amber.operator.typecasting;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;
-import edu.uci.ics.amber.core.tuple.AttributeType;
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName;
+import org.apache.texera.amber.core.tuple.AttributeType;
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName;
 
 @JsonSchemaInject(json =
         "{" +
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/java/JavaUDFOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/java/JavaUDFOpDesc.scala
index a53f9424fbb..5c452a6c1d6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/java/JavaUDFOpDesc.scala
@@ -17,32 +17,26 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.java
+package org.apache.texera.amber.operator.udf.java
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.google.common.base.Preconditions
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.workflow.{
-  PartitionInfo,
-  PhysicalOp,
-  SchemaPropagationFunc,
-  UnknownPartition
-}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, StateTransferFunc}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.{LogicalOp, PortDescription, StateTransferFunc}
 
 import scala.util.{Success, Try}
 class JavaUDFOpDesc extends LogicalOp {
   @JsonProperty(
     required = true,
     defaultValue =
-      "import edu.uci.ics.amber.operator.map.MapOpExec;\n" +
-        "import edu.uci.ics.amber.core.tuple.Tuple;\n" +
-        "import edu.uci.ics.amber.core.tuple.TupleLike;\n" +
+      "import org.apache.texera.amber.operator.map.MapOpExec;\n" +
+        "import org.apache.texera.amber.core.tuple.Tuple;\n" +
+        "import org.apache.texera.amber.core.tuple.TupleLike;\n" +
         "import scala.Function1;\n" +
         "import java.io.Serializable;\n" +
         "\n" +
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala
index f7b3a27317b..3f056c96055 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python
+package org.apache.texera.amber.operator.udf.python
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.google.common.base.Preconditions
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc, UnknownPartition}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class DualInputPortsPythonUDFOpDescV2 extends LogicalOp {
   @JsonProperty(
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/LambdaAttributeUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/LambdaAttributeUnit.java
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/LambdaAttributeUnit.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/LambdaAttributeUnit.java
index c7bfd27bc0c..532fcb93a69 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/LambdaAttributeUnit.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/LambdaAttributeUnit.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python;
+package org.apache.texera.amber.operator.udf.python;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,9 +25,9 @@
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString;
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;
-import edu.uci.ics.amber.core.tuple.AttributeType;
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeNameLambda;
-import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation;
+import org.apache.texera.amber.core.tuple.AttributeType;
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeNameLambda;
+import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation;
 
 import java.util.Objects;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala
index fb006203c6f..9b66dde0759 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python
+package org.apache.texera.amber.operator.udf.python
 
 import com.google.common.base.Preconditions
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeTypeUtils, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Schema}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class PythonLambdaFunctionOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Add/Modify column(s)")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonTableReducerOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonTableReducerOpDesc.scala
index 830d5364753..0c2bb07ff13 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonTableReducerOpDesc.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python
+package org.apache.texera.amber.operator.udf.python
 
 import com.google.common.base.Preconditions
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class PythonTableReducerOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Output columns")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonUDFOpDescV2.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonUDFOpDescV2.scala
index c14838bb784..ef4da06cef9 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonUDFOpDescV2.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python
+package org.apache.texera.amber.operator.udf.python
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.google.common.base.Preconditions
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow._
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, StateTransferFunc}
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.{LogicalOp, PortDescription, StateTransferFunc}
 
 import scala.util.{Success, Try}
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala
index 0f5f31db6de..b575612d884 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python.source
+package org.apache.texera.amber.operator.udf.python.source
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
 
 class PythonUDFSourceOpDescV2 extends SourceOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFOpDesc.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFOpDesc.scala
index 5389634ce8c..8a84c99a195 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFOpDesc.scala
@@ -17,23 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.r
+package org.apache.texera.amber.operator.udf.r
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.google.common.base.Preconditions
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.workflow.{
-  PartitionInfo,
-  PhysicalOp,
-  SchemaPropagationFunc,
-  UnknownPartition
-}
-import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, StateTransferFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow._
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.{LogicalOp, PortDescription, StateTransferFunc}
 
 import scala.util.{Success, Try}
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFSourceOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFSourceOpDesc.scala
index 4b17ecc12d4..6df89a9a0f6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFSourceOpDesc.scala
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.r
+package org.apache.texera.amber.operator.udf.r
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithCode
-import edu.uci.ics.amber.core.tuple.{Attribute, Schema}
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort
+import org.apache.texera.amber.core.executor.OpExecWithCode
+import org.apache.texera.amber.core.tuple.{Attribute, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc}
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.source.SourceOperatorDescriptor
 
 class RUDFSourceOpDesc extends SourceOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpDesc.scala
similarity index 74%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpDesc.scala
index 4aa81fc6c34..a10a4e43004 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpDesc.scala
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.union
+package org.apache.texera.amber.operator.union
 
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, PortIdentity}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, PortIdentity}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class UnionOpDesc extends LogicalOp {
 
@@ -36,7 +36,7 @@ class UnionOpDesc extends LogicalOp {
         workflowId,
         executionId,
         operatorIdentifier,
-        OpExecWithClassName("edu.uci.ics.amber.operator.union.UnionOpExec")
+        OpExecWithClassName("org.apache.texera.amber.operator.union.UnionOpExec")
       )
       .withInputPorts(operatorInfo.inputPorts)
       .withOutputPorts(operatorInfo.outputPorts)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpExec.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpExec.scala
index 1facc963dec..aa9d585c46c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpExec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.union
+package org.apache.texera.amber.operator.union
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
 
 class UnionOpExec extends OperatorExecutor {
   override def processTuple(tuple: Tuple, port: Int): Iterator[TupleLike] = {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpDesc.scala
similarity index 78%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpDesc.scala
index 135d287f121..ef742de3ae4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpDesc.scala
@@ -17,18 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.unneststring
+package org.apache.texera.amber.operator.unneststring
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.AttributeType
-import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.flatmap.FlatMapOpDesc
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort}
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.AttributeType
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.{
+  InputPort,
+  OutputPort,
+  PhysicalOp,
+  SchemaPropagationFunc
+}
+import org.apache.texera.amber.operator.flatmap.FlatMapOpDesc
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class UnnestStringOpDesc extends FlatMapOpDesc {
   @JsonProperty(value = "Delimiter", required = true, defaultValue = ",")
@@ -64,7 +68,7 @@ class UnnestStringOpDesc extends FlatMapOpDesc {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.unneststring.UnnestStringOpExec",
+          "org.apache.texera.amber.operator.unneststring.UnnestStringOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExec.scala
similarity index 84%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExec.scala
index f3b5ce94a16..1e59968217b 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.unneststring
+package org.apache.texera.amber.operator.unneststring
 
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.operator.flatmap.FlatMapOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.operator.flatmap.FlatMapOpExec
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 class UnnestStringOpExec(descString: String) extends FlatMapOpExec {
   private val desc: UnnestStringOpDesc =
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/util/OperatorDescriptorUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/util/OperatorDescriptorUtils.scala
similarity index 97%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/util/OperatorDescriptorUtils.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/util/OperatorDescriptorUtils.scala
index 7b5d2a742d5..3a9e71f8323 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/util/OperatorDescriptorUtils.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/util/OperatorDescriptorUtils.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.util
+package org.apache.texera.amber.operator.util
 
 import scala.collection.mutable
 import scala.jdk.CollectionConverters._
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala
index e8a9ec81998..bf2e152c79d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.DotPlot
+package org.apache.texera.amber.operator.visualization.DotPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 class DotPlotOpDesc extends PythonOperatorDescriptor {
 
@@ -34,6 +36,7 @@ class DotPlotOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Count Attribute")
   @JsonPropertyDescription("the attribute for the counting of the dot plot")
   @AutofillAttributeName
+  @NotNull(message = "Count Attribute column cannot be empty")
   var countAttribute: String = ""
 
   override def getOutputSchemas(
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala
index 0d57f4df08c..7705194685a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala
@@ -17,17 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.IcicleChart
+package org.apache.texera.amber.operator.visualization.IcicleChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.visualization.hierarchychart.HierarchySection
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.visualization.hierarchychart.HierarchySection
+
+import javax.validation.constraints.{NotEmpty, NotNull}
 
 // type constraint: value can only be numeric
 @JsonSchemaInject(json = """
@@ -45,12 +47,14 @@ class IcicleChartOpDesc extends PythonOperatorDescriptor {
   @JsonPropertyDescription(
     "hierarchy of attributes from a root (higher-level category) to leaves (lower-level category)"
   )
+  @NotEmpty(message = "Hierarchy path list cannot be empty")
   var hierarchy: List[HierarchySection] = List()
 
   @JsonProperty(value = "value", required = true)
   @JsonSchemaTitle("Value Column")
   @JsonPropertyDescription("the value associated with the size of each sector in the chart")
   @AutofillAttributeName
+  @NotNull(message = "Value column cannot be empty")
   var value: String = ""
 
   override def getOutputSchemas(
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageUtility.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageUtility.scala
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageUtility.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageUtility.scala
index 21b671f7df3..50dc8e2f544 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageUtility.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageUtility.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization
+package org.apache.texera.amber.operator.visualization
 
 object ImageUtility {
   def encodeImageToHTML(): String = {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala
index ac81e30000c..2f1b9a5e970 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.ImageViz
+package org.apache.texera.amber.operator.visualization.ImageViz
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class ImageVisualizerOpDesc extends PythonOperatorDescriptor {
 
   @JsonProperty(required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala
index c27543ab489..bcb159a8119 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.ScatterMatrixChart
+package org.apache.texera.amber.operator.visualization.ScatterMatrixChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.{
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.{
   AutofillAttributeName,
   AutofillAttributeNameList
 }
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 @JsonSchemaInject(json = """
 {
   "attributeTypeRules": {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDesc.scala
index 5653c420d36..c2a8740c30e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.barChart
+package org.apache.texera.amber.operator.visualization.barChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 //type constraint: value can only be numeric
 @JsonSchemaInject(json = """
@@ -44,12 +46,14 @@ class BarChartOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Value Column")
   @JsonPropertyDescription("The value associated with each category")
   @AutofillAttributeName
+  @NotNull(message = "Value column cannot be empty")
   var value: String = ""
 
   @JsonProperty(required = true)
   @JsonSchemaTitle("Fields")
   @JsonPropertyDescription("Visualize categorical data in a Bar Chart")
   @AutofillAttributeName
+  @NotNull(message = "Fields cannot be empty")
   var fields: String = ""
 
   @JsonProperty(defaultValue = "No Selection", required = false)
@@ -88,8 +92,8 @@ class BarChartOpDesc extends PythonOperatorDescriptor {
     )
 
   def manipulateTable(): String = {
-    assert(value.nonEmpty)
-    assert(fields.nonEmpty)
+    assert(value.nonEmpty, "Value column cannot be empty")
+    assert(fields.nonEmpty, "Fields cannot be empty")
     s"""
        |        table = table.dropna(subset = ['$value', '$fields']) #remove missing values
        |""".stripMargin
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala
index 7b6727360fe..5f57f17937c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.boxViolinPlot
+package org.apache.texera.amber.operator.visualization.boxViolinPlot
 
-import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
+import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription, JsonPropertyOrder}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import com.fasterxml.jackson.annotation.JsonPropertyOrder
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 @JsonPropertyOrder(Array("value", "quartileType", "horizontalOrientation", "violinPlot"))
 @JsonSchemaInject(json = """
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java
index 500c9a43584..d427508ef3f 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.boxViolinPlot;
+package org.apache.texera.amber.operator.visualization.boxViolinPlot;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala
similarity index 83%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala
index a83b8bf75d5..3b95d95158a 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.bubbleChart
+package org.apache.texera.amber.operator.visualization.bubbleChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 /**
   * Visualization Operator to visualize results as a Bubble Chart
@@ -40,17 +42,23 @@ class BubbleChartOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "xValue", required = true)
   @JsonSchemaTitle("X-Column")
   @JsonPropertyDescription("Data column for the x-axis")
-  @AutofillAttributeName var xValue: String = ""
+  @AutofillAttributeName
+  @NotNull(message = "xValue column cannot be empty")
+  var xValue: String = ""
 
   @JsonProperty(value = "yValue", required = true)
   @JsonSchemaTitle("Y-Column")
   @JsonPropertyDescription("Data column for the y-axis")
-  @AutofillAttributeName var yValue: String = ""
+  @AutofillAttributeName
+  @NotNull(message = "yValue column cannot be empty")
+  var yValue: String = ""
 
   @JsonProperty(value = "zValue", required = true)
   @JsonSchemaTitle("Z-Column")
   @JsonPropertyDescription("Data column to determine bubble size")
-  @AutofillAttributeName var zValue: String = ""
+  @AutofillAttributeName
+  @NotNull(message = "zValue column cannot be empty")
+  var zValue: String = ""
 
   @JsonProperty(value = "enableColor", defaultValue = "false")
   @JsonSchemaTitle("Enable Color")
@@ -60,7 +68,9 @@ class BubbleChartOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "colorCategory", required = true)
   @JsonSchemaTitle("Color-Column")
   @JsonPropertyDescription("Picks data column to color bubbles with if color is enabled")
-  @AutofillAttributeName var colorCategory: String = ""
+  @AutofillAttributeName
+  @NotNull(message = "colorCategory column cannot be empty")
+  var colorCategory: String = ""
 
   override def getOutputSchemas(
       inputSchemas: Map[PortIdentity, Schema]
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala
index 3ee3c1f7e3c..93bb11db4b2 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.bulletChart
+package org.apache.texera.amber.operator.visualization.bulletChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 import java.util.{ArrayList, List => JList}
 import scala.jdk.CollectionConverters._
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala
index 6ccc58520a7..0fdc9989928 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.bulletChart
+package org.apache.texera.amber.operator.visualization.bulletChart
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala
index 3732fedde92..62156031213 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.candlestickChart
+package org.apache.texera.amber.operator.visualization.candlestickChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class CandlestickChartOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala
index 6cd969d6a9c..629739dcd15 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.choroplethMap
+package org.apache.texera.amber.operator.visualization.choroplethMap
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 @JsonSchemaInject(json = """
 {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/BandConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/BandConfig.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/BandConfig.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/BandConfig.scala
index f2423cd52dc..c4ae7f7ae02 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/BandConfig.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/BandConfig.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.continuousErrorBands
+package org.apache.texera.amber.operator.visualization.continuousErrorBands
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.visualization.lineChart.LineConfig
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.visualization.lineChart.LineConfig
 
 class BandConfig extends LineConfig {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala
index b5fdf7310e5..dd343ca5f68 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.continuousErrorBands
+package org.apache.texera.amber.operator.visualization.continuousErrorBands
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 import java.util
 import scala.jdk.CollectionConverters.ListHasAsScala
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java
index b3499db311f..f16547964fd 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.contourPlot;
+package org.apache.texera.amber.operator.visualization.contourPlot;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala
index b83405f899c..3c77dd4e044 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.contourPlot
+package org.apache.texera.amber.operator.visualization.contourPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class ContourPlotOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala
index 7ad71c26ad1..4cb31e76746 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.dendrogram
+package org.apache.texera.amber.operator.visualization.dendrogram
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class DendrogramOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "xVal", required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala
similarity index 83%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala
index 963a63fcd6b..13a803debbf 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala
@@ -17,11 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.dumbbellPlot
+package org.apache.texera.amber.operator.visualization.dumbbellPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+
+import javax.validation.constraints.NotNull
 
 @JsonSchemaInject(json = """
 {
@@ -38,6 +40,7 @@ class DumbbellDotConfig {
   @JsonSchemaTitle("Dot Column Value")
   @JsonPropertyDescription("value for dot axis")
   @AutofillAttributeName
+  @NotNull(message = "Dot Column Value cannot be empty")
   var dotValue: String = ""
 
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala
index 6a6d81bc951..ac49336c0a9 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala
@@ -17,19 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.dumbbellPlot
+package org.apache.texera.amber.operator.visualization.dumbbellPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 import java.util
+import javax.validation.constraints.{NotBlank, NotNull}
 import scala.jdk.CollectionConverters.CollectionHasAsScala
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
 //type constraint: measurementColumnName can only be a numeric column
 @JsonSchemaInject(json = """
 {
@@ -46,28 +47,33 @@ class DumbbellPlotOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Category Column Name")
   @JsonPropertyDescription("the name of the category column")
   @AutofillAttributeName
+  @NotNull(message = "Category Column Name cannot be empty")
   var categoryColumnName: String = ""
 
   @JsonProperty(value = "dumbbellStartValue", required = true)
   @JsonSchemaTitle("Dumbbell Start Value")
   @JsonPropertyDescription("the start point value of each dumbbell")
+  @NotBlank(message = "Dumbbell Start Value cannot be empty")
   var dumbbellStartValue: String = ""
 
   @JsonProperty(value = "dumbbellEndValue", required = true)
   @JsonSchemaTitle("Dumbbell End Value")
   @JsonPropertyDescription("the end value of each dumbbell")
+  @NotBlank(message = "Dumbbell End Value cannot be empty")
   var dumbbellEndValue: String = ""
 
   @JsonProperty(value = "measurementColumnName", required = true)
   @JsonSchemaTitle("Measurement Column Name")
   @JsonPropertyDescription("the name of the measurement column")
   @AutofillAttributeName
+  @NotNull(message = "Measurement Column Name cannot be empty")
   var measurementColumnName: String = ""
 
   @JsonProperty(value = "comparedColumnName", required = true)
   @JsonSchemaTitle("Compared Column Name")
   @JsonPropertyDescription("the column name that is being compared")
   @AutofillAttributeName
+  @NotNull(message = "Compared Column Name cannot be empty")
   var comparedColumnName: String = ""
 
   @JsonProperty(value = "dots", required = false)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala
index c6a7b407036..f8d5f0dd354 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.figureFactoryTable
+package org.apache.texera.amber.operator.visualization.figureFactoryTable
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
 
 class FigureFactoryTableConfig {
   @JsonProperty(required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala
index b9a47b45b0a..15d79e327da 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.figureFactoryTable
+package org.apache.texera.amber.operator.visualization.figureFactoryTable
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class FigureFactoryTableOpDesc extends PythonOperatorDescriptor {
 
   @JsonProperty(required = false)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala
index b80b15c0236..f8e54a93f0e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.filledAreaPlot
+package org.apache.texera.amber.operator.visualization.filledAreaPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 class FilledAreaPlotOpDesc extends PythonOperatorDescriptor {
 
@@ -34,12 +36,14 @@ class FilledAreaPlotOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("X-axis Attribute")
   @JsonPropertyDescription("The attribute for your x-axis")
   @AutofillAttributeName
+  @NotNull(message = "X-axis Attribute cannot be empty")
   var x: String = ""
 
   @JsonProperty(required = true)
   @JsonSchemaTitle("Y-axis Attribute")
   @JsonPropertyDescription("The attribute for your y-axis")
   @AutofillAttributeName
+  @NotNull(message = "Y-axis Attribute cannot be empty")
   var y: String = ""
 
   @JsonProperty(required = false)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala
index 02d822c4be1..61ff4ddd393 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.funnelPlot
+package org.apache.texera.amber.operator.visualization.funnelPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 @JsonSchemaInject(json = """
 {
   "attributeTypeRules": {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala
index 18c27e3f40c..3be1ae9fa55 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.ganttChart
+package org.apache.texera.amber.operator.visualization.ganttChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 @JsonSchemaInject(json = """
 {
@@ -46,18 +48,21 @@ class GanttChartOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Start Datetime Column")
   @JsonPropertyDescription("the start timestamp of the task")
   @AutofillAttributeName
+  @NotNull(message = "Start Datetime Column cannot be empty")
   var start: String = ""
 
   @JsonProperty(value = "finish", required = true)
   @JsonSchemaTitle("Finish Datetime Column")
   @JsonPropertyDescription("the end timestamp of the task")
   @AutofillAttributeName
+  @NotNull(message = "Finish Datetime Column cannot be empty")
   var finish: String = ""
 
   @JsonProperty(value = "task", required = true)
   @JsonSchemaTitle("Task Column")
   @JsonPropertyDescription("the name of the task")
   @AutofillAttributeName
+  @NotNull(message = "Task Column cannot be empty")
   var task: String = ""
 
   @JsonProperty(value = "color", required = false)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala
index 07a3fc5a21c..fdc48ccc2a3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala
@@ -16,18 +16,18 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.gaugeChart
+package org.apache.texera.amber.operator.visualization.gaugeChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class GaugeChartOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "value", required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala
index 9d563e25705..78f407af37e 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.gaugeChart
+package org.apache.texera.amber.operator.visualization.gaugeChart
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/heatMap/HeatMapOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/heatMap/HeatMapOpDesc.scala
index c67f20a094f..f66730090e7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/heatMap/HeatMapOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.heatMap
+package org.apache.texera.amber.operator.visualization.heatMap
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class HeatMapOpDesc extends PythonOperatorDescriptor {
 
   @JsonProperty(value = "x", required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala
index 5f6832db26e..5b42935307c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala
@@ -17,16 +17,19 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.hierarchychart
+package org.apache.texera.amber.operator.visualization.hierarchychart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.{NotEmpty, NotNull}
+
 // type constraint: value can only be numeric
 @JsonSchemaInject(json = """
 {
@@ -41,6 +44,7 @@ class HierarchyChartOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(required = true)
   @JsonSchemaTitle("Chart Type")
   @JsonPropertyDescription("Treemap or Sunburst")
+  @NotNull(message = "Hierarchy Chart Type cannot be empty")
   var hierarchyChartType: HierarchyChartType = _
 
   @JsonProperty(required = true)
@@ -48,12 +52,14 @@ class HierarchyChartOpDesc extends PythonOperatorDescriptor {
   @JsonPropertyDescription(
     "Hierarchy of attributes from a higher-level category to lower-level category"
   )
+  @NotEmpty(message = "Hierarchy path list cannot be empty")
   var hierarchy: List[HierarchySection] = List()
 
   @JsonProperty(value = "value", required = true)
   @JsonSchemaTitle("Value Column")
   @JsonPropertyDescription("The value associated with the size of each sector in the chart")
   @AutofillAttributeName
+  @NotNull(message = "Value column cannot be empty")
   var value: String = ""
 
   override def getOutputSchemas(
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartType.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartType.java
index 53c96969bc7..91a28d3f54d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.hierarchychart;
+package org.apache.texera.amber.operator.visualization.hierarchychart;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchySection.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchySection.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchySection.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchySection.scala
index e98300a8882..9d8946f7b1d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchySection.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchySection.scala
@@ -17,11 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.hierarchychart
+package org.apache.texera.amber.operator.visualization.hierarchychart
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+
+import javax.validation.constraints.NotNull
 
 // This is a hack to get a order-preserve selection from the combobox
 // TODO: remove it after we enabled a order-preserve combobox on the frontend.
@@ -29,5 +31,6 @@ class HierarchySection {
   @JsonProperty(required = true)
   @JsonSchemaTitle("Attribute Name")
   @AutofillAttributeName
+  @NotNull(message = "Attribute Name cannot be empty")
   var attributeName: String = ""
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram/HistogramChartOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram/HistogramChartOpDesc.scala
index 98326cb1e0c..8e3ac2c3793 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram/HistogramChartOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.histogram
+package org.apache.texera.amber.operator.visualization.histogram
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 class HistogramChartOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "value", required = true)
   @JsonSchemaTitle("Value Column")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala
index 23fdb9a317e..1068b5e8fa8 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala
@@ -16,17 +16,16 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.histogram2d
+package org.apache.texera.amber.operator.visualization.histogram2d
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.visualization.histogram2d.NormalizationType
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class Histogram2DOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram2d/NormalizationType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/NormalizationType.java
similarity index 94%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram2d/NormalizationType.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/NormalizationType.java
index 9a7126a66b7..62d670ba4e7 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram2d/NormalizationType.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/NormalizationType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.histogram2d;
+package org.apache.texera.amber.operator.visualization.histogram2d;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala
similarity index 72%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala
index d615b294fd9..f5b9bb81e7c 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala
@@ -17,19 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.htmlviz
+package org.apache.texera.amber.operator.visualization.htmlviz
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{
+  InputPort,
+  OutputPort,
+  PhysicalOp,
+  SchemaPropagationFunc
+}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 /**
   * HTML Visualization operator to render any given HTML code
@@ -50,7 +55,7 @@ class HtmlVizOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.visualization.htmlviz.HtmlVizOpExec",
+          "org.apache.texera.amber.operator.visualization.htmlviz.HtmlVizOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala
index 4539f4c91c8..d9d8135cb51 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.htmlviz
+package org.apache.texera.amber.operator.visualization.htmlviz
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 /**
   * HTML Visualization operator to render any given HTML code
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineChartOpDesc.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineChartOpDesc.scala
index 601bc7a422e..90613e855e4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineChartOpDesc.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.lineChart
+package org.apache.texera.amber.operator.visualization.lineChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 import java.util
 import scala.jdk.CollectionConverters.ListHasAsScala
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineConfig.scala
similarity index 85%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineConfig.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineConfig.scala
index f77af4cb900..46eb19004d2 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineConfig.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineConfig.scala
@@ -17,11 +17,13 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.lineChart
+package org.apache.texera.amber.operator.visualization.lineChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+
+import javax.validation.constraints.NotNull
 
 //type constraint: value can only be numeric
 @JsonSchemaInject(json = """
@@ -42,12 +44,14 @@ class LineConfig {
   @JsonSchemaTitle("Y Value")
   @JsonPropertyDescription("value for y axis")
   @AutofillAttributeName
+  @NotNull(message = "Y Value cannot be empty")
   var yValue: String = ""
 
   @JsonProperty(value = "x", required = true)
   @JsonSchemaTitle("X Value")
   @JsonPropertyDescription("value for x axis")
   @AutofillAttributeName
+  @NotNull(message = "X Value cannot be empty")
   var xValue: String = ""
 
   @JsonProperty(
@@ -56,6 +60,7 @@ class LineConfig {
     defaultValue = "line with dots"
   )
   @JsonSchemaTitle("Line Mode")
+  @NotNull(message = "Line Mode cannot be empty")
   var mode: LineMode = LineMode.LINE_WITH_DOTS
 
   @JsonProperty(value = "name", required = false)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineMode.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineMode.java
similarity index 96%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineMode.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineMode.java
index c9b6174956a..ba21a5d7f25 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineMode.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineMode.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.lineChart;
+package org.apache.texera.amber.operator.visualization.lineChart;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/nestedTable/NestedTableConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableConfig.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/nestedTable/NestedTableConfig.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableConfig.scala
index 759bc856f80..832346a3790 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/nestedTable/NestedTableConfig.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableConfig.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.nestedTable
+package org.apache.texera.amber.operator.visualization.nestedTable
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
 
 class NestedTableConfig {
   @JsonProperty(required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala
index 3a518659713..f27face37d3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.nestedTable
+package org.apache.texera.amber.operator.visualization.nestedTable
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 import java.util
 import scala.jdk.CollectionConverters.ListHasAsScala
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala
index 44c568a6d31..16537e5d944 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.networkGraph
+package org.apache.texera.amber.operator.visualization.networkGraph
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class NetworkGraphOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(required = true)
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDesc.scala
index 1a28cf19c24..444987eebf6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.pieChart
+package org.apache.texera.amber.operator.visualization.pieChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 // type constraint: value can only be numeric
 @JsonSchemaInject(json = """
@@ -44,12 +46,14 @@ class PieChartOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Value Column")
   @JsonPropertyDescription("The value associated with slice of pie")
   @AutofillAttributeName
+  @NotNull(message = "Value column cannot be empty")
   var value: String = ""
 
   @JsonProperty(value = "name", required = true)
   @JsonSchemaTitle("Name Column")
   @JsonPropertyDescription("The name of the slice of pie")
   @AutofillAttributeName
+  @NotNull(message = "Name column cannot be empty")
   var name: String = ""
 
   override def getOutputSchemas(
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala
similarity index 90%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala
index eba0c07460f..4eaf9a35ca6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.quiverPlot
+package org.apache.texera.amber.operator.visualization.quiverPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 @JsonSchemaInject(json = """
 {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java
similarity index 95%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java
index 27e568e0a12..b1dc6e8444d 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.rangeSlider;
+package org.apache.texera.amber.operator.visualization.rangeSlider;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala
index b840a78779c..b0691ccdbd6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.rangeSlider
+package org.apache.texera.amber.operator.visualization.rangeSlider
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 // type constraint: value can only be numeric
 @JsonSchemaInject(json = """
@@ -42,12 +44,16 @@ class RangeSliderOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "Y-axis", required = true)
   @JsonSchemaTitle("Y-axis")
   @JsonPropertyDescription("The name of the column to represent y-axis")
-  @AutofillAttributeName var yAxis: String = ""
+  @AutofillAttributeName
+  @NotNull(message = "Y-axis cannot be empty")
+  var yAxis: String = ""
 
   @JsonProperty(value = "X-axis", required = true)
   @JsonSchemaTitle("X-axis")
   @JsonPropertyDescription("The name of the column to represent the x-axis")
-  @AutofillAttributeName var xAxis: String = ""
+  @AutofillAttributeName
+  @NotNull(message = "X-axis cannot be empty")
+  var xAxis: String = ""
 
   @JsonProperty(value = "Duplicates", required = false)
   @JsonSchemaTitle("Handle Duplicates")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala
index 4fa4fea1584..76d089d345f 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.sankeyDiagram
+package org.apache.texera.amber.operator.visualization.sankeyDiagram
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 class SankeyDiagramOpDesc extends PythonOperatorDescriptor {
 
@@ -34,18 +36,21 @@ class SankeyDiagramOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("Source Attribute")
   @JsonPropertyDescription("The source node of the Sankey diagram")
   @AutofillAttributeName
+  @NotNull(message = "Source Attribute cannot be empty")
   var sourceAttribute: String = ""
 
   @JsonProperty(value = "Target Attribute", required = true)
   @JsonSchemaTitle("Target Attribute")
   @JsonPropertyDescription("The target node of the Sankey diagram")
   @AutofillAttributeName
+  @NotNull(message = "Target Attribute cannot be empty")
   var targetAttribute: String = ""
 
   @JsonProperty(value = "Value Attribute", required = true)
   @JsonSchemaTitle("Value Attribute")
   @JsonPropertyDescription("The value/volume of the flow between source and target")
   @AutofillAttributeName
+  @NotNull(message = "Value Attribute cannot be empty")
   var valueAttribute: String = ""
 
   override def getOutputSchemas(
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala
index 986b51c33d5..f81e2b654a8 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.scatter3DChart
+package org.apache.texera.amber.operator.visualization.scatter3DChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 @JsonSchemaInject(json = """
 {
   "attributeTypeRules": {
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
similarity index 82%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
index 2620a5eb298..ffdbb2b8cc3 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.scatterplot
+package org.apache.texera.amber.operator.visualization.scatterplot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotNull
 
 @JsonSchemaInject(
   json =
@@ -47,12 +49,14 @@ class ScatterplotOpDesc extends PythonOperatorDescriptor {
   @JsonSchemaTitle("X-Column")
   @JsonPropertyDescription("X Column")
   @AutofillAttributeName
+  @NotNull(message = "X-Column cannot be null")
   private val xColumn: String = ""
 
   @JsonProperty(required = true)
   @JsonSchemaTitle("Y-Column")
   @JsonPropertyDescription("Y Column")
   @AutofillAttributeName
+  @NotNull(message = "Y-Column cannot be null")
   private val yColumn: String = ""
 
   @JsonProperty(required = false)
@@ -119,17 +123,20 @@ class ScatterplotOpDesc extends PythonOperatorDescriptor {
 
   def createPlotlyFigure(): String = {
     assert(xColumn.nonEmpty && yColumn.nonEmpty)
-    val colorColExpr = if (colorColumn.nonEmpty) {
-      s"color='$colorColumn'"
-    } else {
-      ""
-    }
-    var argDetails = ""
-    if (xLogScale) argDetails = argDetails + ", log_x=True"
-    if (yLogScale) argDetails = argDetails + ", log_y=True"
-    if (hoverName.nonEmpty) argDetails = argDetails + s""", hover_name='$hoverName'"""
+
+    val args = scala.collection.mutable.ArrayBuffer[String](
+      s"x='$xColumn'",
+      s"y='$yColumn'",
+      s"opacity=$alpha"
+    )
+    if (colorColumn.nonEmpty) args += s"color='$colorColumn'"
+    if (xLogScale) args += "log_x=True"
+    if (yLogScale) args += "log_y=True"
+    if (hoverName.nonEmpty) args += s"hover_name='$hoverName'"
+
+    val joined = args.mkString(", ")
     s"""
-       |        fig = go.Figure(px.scatter(table, x='$xColumn', y='$yColumn', opacity=$alpha, $colorColExpr $argDetails))
+       |        fig = go.Figure(px.scatter(table, $joined))
        |        fig.update_layout(margin=dict(l=0, r=0, t=0, b=0))
        |""".stripMargin
   }
diff --git a/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/stripChart/StripChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/stripChart/StripChartOpDesc.scala
new file mode 100644
index 00000000000..89f14b5a717
--- /dev/null
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/stripChart/StripChartOpDesc.scala
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.visualization.stripChart
+
+import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
+import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+class StripChartOpDesc extends PythonOperatorDescriptor {
+
+  @JsonProperty(value = "x", required = true)
+  @JsonSchemaTitle("X-Axis Column")
+  @JsonPropertyDescription("Column containing numeric values for the x-axis")
+  @AutofillAttributeName
+  var x: String = ""
+
+  @JsonProperty(value = "y", required = true)
+  @JsonSchemaTitle("Y-Axis Column")
+  @JsonPropertyDescription("Column containing categorical values for the y-axis")
+  @AutofillAttributeName
+  var y: String = ""
+
+  @JsonProperty(value = "colorBy", required = false)
+  @JsonSchemaTitle("Color By")
+  @JsonPropertyDescription("Optional - Color points by category")
+  @AutofillAttributeName
+  var colorBy: String = ""
+
+  @JsonProperty(value = "facetColumn", required = false)
+  @JsonSchemaTitle("Facet Column")
+  @JsonPropertyDescription("Optional - Create separate subplots for each category")
+  @AutofillAttributeName
+  var facetColumn: String = ""
+
+  override def getOutputSchemas(
+      inputSchemas: Map[PortIdentity, Schema]
+  ): Map[PortIdentity, Schema] = {
+    val outputSchema = Schema()
+      .add("html-content", AttributeType.STRING)
+    Map(operatorInfo.outputPorts.head.id -> outputSchema)
+  }
+
+  override def operatorInfo: OperatorInfo =
+    OperatorInfo(
+      "Strip Chart",
+      "Visualize distribution of data points as a strip plot",
+      OperatorGroupConstants.VISUALIZATION_STATISTICAL_GROUP,
+      inputPorts = List(InputPort()),
+      outputPorts = List(OutputPort(mode = OutputMode.SINGLE_SNAPSHOT))
+    )
+
+  override def generatePythonCode(): String = {
+    val colorByParam = if (colorBy != null && colorBy.nonEmpty) s", color='$colorBy'" else ""
+    val facetColParam =
+      if (facetColumn != null && facetColumn.nonEmpty) s", facet_col='$facetColumn'" else ""
+
+    s"""from pytexera import *
+       |import plotly.express as px
+       |import plotly.io as pio
+       |
+       |class ProcessTableOperator(UDFTableOperator):
+       |
+       |    @overrides
+       |    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:
+       |        x_values = table['$x']
+       |        y_values = table['$y']
+       |
+       |        # Create data dictionary
+       |        data = {'$x': x_values, '$y': y_values}
+       |
+       |        # Add optional color column if specified
+       |        if '$colorBy':
+       |            data['$colorBy'] = table['$colorBy']
+       |
+       |        # Add optional facet column if specified
+       |        if '$facetColumn':
+       |            data['$facetColumn'] = table['$facetColumn']
+       |
+       |        # Create strip chart
+       |        fig = px.strip(
+       |            data,
+       |            x='$x',
+       |            y='$y'$colorByParam$facetColParam
+       |        )
+       |
+       |        # Update layout for better visualization
+       |        fig.update_traces(marker=dict(size=8, line=dict(width=0.5, color='DarkSlateGrey')))
+       |        fig.update_layout(
+       |            xaxis_title='$x',
+       |            yaxis_title='$y',
+       |            hovermode='closest'
+       |        )
+       |
+       |        # Convert to HTML
+       |        html = pio.to_html(fig, include_plotlyjs='cdn', full_html=False)
+       |        yield {'html-content': html}
+       |""".stripMargin
+  }
+}
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesConfig.scala
similarity index 81%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesConfig.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesConfig.scala
index a651ce7d18e..fddc63b67d1 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesConfig.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesConfig.scala
@@ -17,15 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.tablesChart
+package org.apache.texera.amber.operator.visualization.tablesChart
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+
+import javax.validation.constraints.NotNull
 
 class TablesConfig {
   @JsonProperty(required = true)
   @JsonSchemaTitle("Attribute Name")
   @AutofillAttributeName
+  @NotNull(message = "Attribute Name cannot be empty")
   var attributeName: String = ""
 }
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala
index f58af72b1c4..b02c1b5f4fe 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala
@@ -17,18 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.tablesChart
+package org.apache.texera.amber.operator.visualization.tablesChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+
+import javax.validation.constraints.NotEmpty
 class TablesPlotOpDesc extends PythonOperatorDescriptor {
 
   @JsonPropertyDescription("List of columns to include in the table chart")
   @JsonProperty(value = "add attribute", required = true)
+  @NotEmpty(message = "Included columns list cannot be empty")
   var includedColumns: List[TablesConfig] = List()
 
   private def getAttributes: String =
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala
similarity index 91%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala
index 431e16b4a12..ac42186fc2f 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.ternaryPlot
+package org.apache.texera.amber.operator.visualization.ternaryPlot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 /**
   * Visualization Operator for Ternary Plots.
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/treeplot/TreeplotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/treeplot/TreeplotOpDesc.scala
similarity index 93%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/treeplot/TreeplotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/treeplot/TreeplotOpDesc.scala
index f81eaa17a32..8c4ef7181a0 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/treeplot/TreeplotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/treeplot/TreeplotOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.treeplot
+package org.apache.texera.amber.operator.visualization.treeplot
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 /**
   * Visualization Operator for Tree Plots.
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpDesc.scala
similarity index 73%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpDesc.scala
index 048d0055256..e367cbc3012 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpDesc.scala
@@ -17,19 +17,24 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.urlviz
+package org.apache.texera.amber.operator.visualization.urlviz
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle}
-import edu.uci.ics.amber.core.executor.OpExecWithClassName
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc}
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.executor.OpExecWithClassName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{
+  InputPort,
+  OutputPort,
+  PhysicalOp,
+  SchemaPropagationFunc
+}
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 /**
   * URL Visualization operator to render any content in given URL link
@@ -61,7 +66,7 @@ class UrlVizOpDesc extends LogicalOp {
         executionId,
         operatorIdentifier,
         OpExecWithClassName(
-          "edu.uci.ics.amber.operator.visualization.urlviz.UrlVizOpExec",
+          "org.apache.texera.amber.operator.visualization.urlviz.UrlVizOpExec",
           objectMapper.writeValueAsString(this)
         )
       )
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpExec.scala
similarity index 86%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpExec.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpExec.scala
index 0a2ce21af26..5e5338aee36 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpExec.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpExec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.urlviz
+package org.apache.texera.amber.operator.visualization.urlviz
 
-import edu.uci.ics.amber.core.executor.OperatorExecutor
-import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.executor.OperatorExecutor
+import org.apache.texera.amber.core.tuple.{Tuple, TupleLike}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 
 /**
   * URL Visualization operator to render any given URL link
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala
similarity index 89%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala
index 5fedfa687e6..86aa6f833fb 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.volcanoPlot
+package org.apache.texera.amber.operator.visualization.volcanoPlot
 
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class VolcanoPlotOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala
similarity index 88%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala
index 43a2457f694..c2bb497aec4 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.waterfallChart
+package org.apache.texera.amber.operator.visualization.waterfallChart
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
 
 class WaterfallChartOpDesc extends PythonOperatorDescriptor {
 
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala
similarity index 87%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala
index ada758ae356..5a78978d867 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.wordCloud
+package org.apache.texera.amber.operator.visualization.wordCloud
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.kjetland.jackson.jsonSchema.annotations.{
@@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{
   JsonSchemaInt,
   JsonSchemaTitle
 }
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode
-import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
-import edu.uci.ics.amber.operator.PythonOperatorDescriptor
-import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName
-import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
-import edu.uci.ics.amber.operator.visualization.ImageUtility
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
+import org.apache.texera.amber.operator.PythonOperatorDescriptor
+import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
+import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.operator.visualization.ImageUtility
 class WordCloudOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(required = true)
   @JsonSchemaTitle("Text column")
diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/util/ObjectMapperUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/util/ObjectMapperUtils.scala
similarity index 92%
rename from core/workflow-operator/src/main/scala/edu/uci/ics/amber/util/ObjectMapperUtils.scala
rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/util/ObjectMapperUtils.scala
index 5d15b565704..7d7168299a6 100644
--- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/util/ObjectMapperUtils.scala
+++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/util/ObjectMapperUtils.scala
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
-import edu.uci.ics.amber.operator.metadata.OperatorMetadataGenerator
+import org.apache.texera.amber.operator.metadata.OperatorMetadataGenerator
 
 object ObjectMapperUtils {
 
diff --git a/core/workflow-operator/src/test/resources/100.jsonl b/common/workflow-operator/src/test/resources/100.jsonl
similarity index 100%
rename from core/workflow-operator/src/test/resources/100.jsonl
rename to common/workflow-operator/src/test/resources/100.jsonl
diff --git a/core/workflow-operator/src/test/resources/1000.jsonl b/common/workflow-operator/src/test/resources/1000.jsonl
similarity index 100%
rename from core/workflow-operator/src/test/resources/1000.jsonl
rename to common/workflow-operator/src/test/resources/1000.jsonl
diff --git a/core/workflow-operator/src/test/resources/country_sales_headerless_small.csv b/common/workflow-operator/src/test/resources/country_sales_headerless_small.csv
similarity index 100%
rename from core/workflow-operator/src/test/resources/country_sales_headerless_small.csv
rename to common/workflow-operator/src/test/resources/country_sales_headerless_small.csv
diff --git a/core/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line.csv b/common/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line.csv
similarity index 100%
rename from core/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line.csv
rename to common/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line.csv
diff --git a/core/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line_custom_delimiter.csv b/common/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line_custom_delimiter.csv
similarity index 100%
rename from core/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line_custom_delimiter.csv
rename to common/workflow-operator/src/test/resources/country_sales_headerless_small_multi_line_custom_delimiter.csv
diff --git a/core/workflow-operator/src/test/resources/country_sales_medium.csv b/common/workflow-operator/src/test/resources/country_sales_medium.csv
similarity index 100%
rename from core/workflow-operator/src/test/resources/country_sales_medium.csv
rename to common/workflow-operator/src/test/resources/country_sales_medium.csv
diff --git a/core/workflow-core/src/test/resources/country_sales_small.csv b/common/workflow-operator/src/test/resources/country_sales_small.csv
similarity index 100%
rename from core/workflow-core/src/test/resources/country_sales_small.csv
rename to common/workflow-operator/src/test/resources/country_sales_small.csv
diff --git a/core/workflow-operator/src/test/resources/country_sales_small_multi_line.csv b/common/workflow-operator/src/test/resources/country_sales_small_multi_line.csv
similarity index 100%
rename from core/workflow-operator/src/test/resources/country_sales_small_multi_line.csv
rename to common/workflow-operator/src/test/resources/country_sales_small_multi_line.csv
diff --git a/core/workflow-operator/src/test/resources/line_numbers.txt b/common/workflow-operator/src/test/resources/line_numbers.txt
similarity index 100%
rename from core/workflow-operator/src/test/resources/line_numbers.txt
rename to common/workflow-operator/src/test/resources/line_numbers.txt
diff --git a/core/workflow-operator/src/test/resources/line_numbers_crlf.txt b/common/workflow-operator/src/test/resources/line_numbers_crlf.txt
similarity index 100%
rename from core/workflow-operator/src/test/resources/line_numbers_crlf.txt
rename to common/workflow-operator/src/test/resources/line_numbers_crlf.txt
diff --git a/core/workflow-operator/src/test/resources/numbers.txt b/common/workflow-operator/src/test/resources/numbers.txt
similarity index 100%
rename from core/workflow-operator/src/test/resources/numbers.txt
rename to common/workflow-operator/src/test/resources/numbers.txt
diff --git a/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/aggregate/AggregateOpSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/aggregate/AggregateOpSpec.scala
new file mode 100644
index 00000000000..170efee7732
--- /dev/null
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/aggregate/AggregateOpSpec.scala
@@ -0,0 +1,503 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.aggregate
+
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.scalatest.funsuite.AnyFunSuite
+
+class AggregateOpSpec extends AnyFunSuite {
+
+  /** Helpers */
+
+  private def makeAggregationOp(
+      fn: AggregationFunction,
+      attributeName: String,
+      resultName: String
+  ): AggregationOperation = {
+    val operation = new AggregationOperation()
+    operation.aggFunction = fn
+    operation.attribute = attributeName
+    operation.resultAttribute = resultName
+    operation
+  }
+
+  private def makeSchema(fields: (String, AttributeType)*): Schema =
+    Schema(fields.map { case (n, t) => new Attribute(n, t) }.toList)
+
+  private def makeTuple(schema: Schema, values: Any*): Tuple =
+    Tuple(schema, values.toArray)
+
+  test("getAggregationAttribute keeps original type for SUM") {
+    val operation = makeAggregationOp(AggregationFunction.SUM, "amount", "total_amount")
+    val attr = operation.getAggregationAttribute(AttributeType.DOUBLE)
+
+    assert(attr.getName == "total_amount")
+    assert(attr.getType == AttributeType.DOUBLE)
+  }
+
+  test("getAggregationAttribute maps COUNT result to INTEGER regardless of input type") {
+    val operation = makeAggregationOp(AggregationFunction.COUNT, "quantity", "row_count")
+    val attr = operation.getAggregationAttribute(AttributeType.LONG)
+
+    assert(attr.getName == "row_count")
+    assert(attr.getType == AttributeType.INTEGER)
+  }
+
+  test("getAggregationAttribute maps CONCAT result type to STRING") {
+    val operation = makeAggregationOp(AggregationFunction.CONCAT, "tag", "all_tags")
+    val attr = operation.getAggregationAttribute(AttributeType.INTEGER)
+
+    assert(attr.getName == "all_tags")
+    assert(attr.getType == AttributeType.STRING)
+  }
+
+  // ---------------------------------------------------------------------------
+  // Basic DistributedAggregation behaviour via AggregationOperation.getAggFunc
+  // ---------------------------------------------------------------------------
+
+  test("SUM aggregation over INTEGER column adds values correctly") {
+    val schema = makeSchema("amount" -> AttributeType.INTEGER)
+    val tuple1 = makeTuple(schema, 5)
+    val tuple2 = makeTuple(schema, 7)
+    val tuple3 = makeTuple(schema, 3)
+
+    val operation = makeAggregationOp(AggregationFunction.SUM, "amount", "total_amount")
+    val agg = operation.getAggFunc(AttributeType.INTEGER)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[Number].intValue()
+    assert(result == 15)
+  }
+
+  test("SUM aggregation over DOUBLE column keeps fractional part") {
+    val schema = makeSchema("score" -> AttributeType.DOUBLE)
+    val tuple1 = makeTuple(schema, 1.25)
+    val tuple2 = makeTuple(schema, 2.75)
+
+    val operation = makeAggregationOp(AggregationFunction.SUM, "score", "total_score")
+    val agg = operation.getAggFunc(AttributeType.DOUBLE)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+
+    val result = agg.finalAgg(partial).asInstanceOf[java.lang.Double].doubleValue()
+    assert(math.abs(result - 4.0) < 1e-6)
+  }
+
+  test("COUNT aggregation with attribute == null counts all rows") {
+    val schema = makeSchema("points" -> AttributeType.INTEGER)
+    val tuple1 = makeTuple(schema, 10)
+    val tuple2 = makeTuple(schema, null)
+    val tuple3 = makeTuple(schema, 20)
+
+    val operation = makeAggregationOp(AggregationFunction.COUNT, null, "row_count")
+    val agg = operation.getAggFunc(AttributeType.INTEGER)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[Number].intValue()
+    assert(result == 3)
+  }
+
+  test("COUNT aggregation with attribute set only counts non-null values") {
+    val schema = makeSchema("points" -> AttributeType.INTEGER)
+    val tuple1 = makeTuple(schema, 10)
+    val tuple2 = makeTuple(schema, null)
+    val tuple3 = makeTuple(schema, 5)
+
+    val operation = makeAggregationOp(AggregationFunction.COUNT, "points", "non_null_points")
+    val agg = operation.getAggFunc(AttributeType.INTEGER)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[Number].intValue()
+    assert(result == 2)
+  }
+
+  test("CONCAT aggregation concatenates string representations with commas") {
+    val schema = makeSchema("tag" -> AttributeType.STRING)
+    val tuple1 = makeTuple(schema, "red")
+    val tuple2 = makeTuple(schema, null)
+    val tuple3 = makeTuple(schema, "blue")
+
+    val operation = makeAggregationOp(AggregationFunction.CONCAT, "tag", "all_tags")
+    val agg = operation.getAggFunc(AttributeType.STRING)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[String]
+    assert(result == "red,,blue")
+  }
+
+  test("MIN aggregation finds smallest INTEGER and returns null when given no values") {
+    val schema = makeSchema("temperature" -> AttributeType.INTEGER)
+    val tuple1 = makeTuple(schema, 10)
+    val tuple2 = makeTuple(schema, -2)
+    val tuple3 = makeTuple(schema, 5)
+
+    val operation = makeAggregationOp(AggregationFunction.MIN, "temperature", "min_temp")
+    val agg = operation.getAggFunc(AttributeType.INTEGER)
+
+    // Empty case: never iterate, just finalize init
+    val emptyPartial = agg.init()
+    val emptyResult = agg.finalAgg(emptyPartial)
+    assert(emptyResult == null)
+
+    // Non-empty case
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[Number].intValue()
+    assert(result == -2)
+  }
+
+  test("MAX aggregation finds largest LONG value") {
+    val schema = makeSchema("latency" -> AttributeType.LONG)
+    val tuple1 = makeTuple(schema, 100L)
+    val tuple2 = makeTuple(schema, 50L)
+    val tuple3 = makeTuple(schema, 250L)
+
+    val operation = makeAggregationOp(AggregationFunction.MAX, "latency", "max_latency")
+    val agg = operation.getAggFunc(AttributeType.LONG)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[java.lang.Long].longValue()
+    assert(result == 250L)
+  }
+
+  test(
+    "MIN aggregation (DOUBLE) is solid: empty/null/NaN, infinities, signed zero, and many values"
+  ) {
+    val schema = makeSchema("temperature" -> AttributeType.DOUBLE)
+
+    val operation = makeAggregationOp(AggregationFunction.MIN, "temperature", "min_temp")
+    val agg = operation.getAggFunc(AttributeType.DOUBLE)
+
+    // -----------------------
+    // 0) Empty input => null
+    // -----------------------
+    val emptyPartial = agg.init()
+    val emptyResult = agg.finalAgg(emptyPartial)
+    assert(emptyResult == null)
+
+    // ---------------------------------------------------------
+    // 1) Only nulls / only NaNs => null
+    // ---------------------------------------------------------
+    val onlyNulls = Seq(makeTuple(schema, null), makeTuple(schema, null), makeTuple(schema, null))
+    var partialNulls = agg.init()
+    onlyNulls.foreach(tp => partialNulls = agg.iterate(partialNulls, tp))
+    assert(agg.finalAgg(partialNulls) == null)
+
+    val onlyNaNs = Seq(makeTuple(schema, Double.NaN), makeTuple(schema, Double.NaN))
+    var partialNans = agg.init()
+    onlyNaNs.foreach(tp => partialNans = agg.iterate(partialNans, tp))
+    assert(agg.finalAgg(partialNans) == null)
+
+    // ---------------------------------------------------------
+    // 2) Basic decimals + negatives: should find the true minimum
+    // ---------------------------------------------------------
+    val basics = Seq(
+      makeTuple(schema, 10.25),
+      makeTuple(schema, -2.5),
+      makeTuple(schema, 5.0),
+      makeTuple(schema, -2.5000000001), // slightly smaller than -2.5
+      makeTuple(schema, 1.0e-12)
+    )
+
+    var partial = agg.init()
+    basics.foreach(tp => partial = agg.iterate(partial, tp))
+
+    val basicResult = agg.finalAgg(partial).asInstanceOf[Number].doubleValue()
+    assert(basicResult == -2.5000000001)
+
+    // ---------------------------------------------------------
+    // 3) NaN + null interleaving must not poison the result
+    //    (especially if NaN appears first)
+    // ---------------------------------------------------------
+    val mixed = Seq(
+      makeTuple(schema, Double.NaN),
+      makeTuple(schema, null),
+      makeTuple(schema, 3.14159),
+      makeTuple(schema, -0.125),
+      makeTuple(schema, Double.NaN),
+      makeTuple(schema, -9999.0),
+      makeTuple(schema, null)
+    )
+
+    var partialMixed = agg.init()
+    mixed.foreach(tp => partialMixed = agg.iterate(partialMixed, tp))
+
+    val mixedResult = agg.finalAgg(partialMixed).asInstanceOf[Number].doubleValue()
+    assert(mixedResult == -9999.0)
+
+    // ---------------------------------------------------------
+    // 4) Infinities: min should be -Infinity if present
+    // ---------------------------------------------------------
+    val infinities = Seq(
+      makeTuple(schema, Double.PositiveInfinity),
+      makeTuple(schema, 42.0),
+      makeTuple(schema, Double.NegativeInfinity),
+      makeTuple(schema, -1.0)
+    )
+
+    var partialInf = agg.init()
+    infinities.foreach(tp => partialInf = agg.iterate(partialInf, tp))
+
+    val infResult = agg.finalAgg(partialInf).asInstanceOf[Number].doubleValue()
+    assert(infResult.isNegInfinity)
+
+    // ---------------------------------------------------------
+    // 5) Signed zero: MIN(-0.0, +0.0) should be -0.0
+    // ---------------------------------------------------------
+    val signedZero = Seq(makeTuple(schema, 0.0), makeTuple(schema, -0.0), makeTuple(schema, 0.0))
+    var partialZero = agg.init()
+    signedZero.foreach(tp => partialZero = agg.iterate(partialZero, tp))
+
+    val zeroValue = agg.finalAgg(partialZero).asInstanceOf[Number].doubleValue()
+    val zeroBits = java.lang.Double.doubleToRawLongBits(zeroValue)
+    val negZeroBits = java.lang.Double.doubleToRawLongBits(-0.0)
+    assert(zeroBits == negZeroBits)
+
+    // ---------------------------------------------------------
+    // 6) Stress test: many values, compare against a reference min
+    //    Reference rule here: ignore null and NaN; return null if none left.
+    // ---------------------------------------------------------
+    val rng = new scala.util.Random(1337)
+    val values: Seq[java.lang.Double] =
+      (1 to 10000).map { index =>
+        index % 250 match {
+          case 0 => null
+          case 1 => Double.NaN
+          case 2 => Double.PositiveInfinity
+          case 3 => Double.NegativeInfinity
+          case 4 => -0.0
+          case _ =>
+            // wide-ish range with some tiny magnitudes too
+            val sign = if (rng.nextBoolean()) 1.0 else -1.0
+            sign * (rng.nextDouble() * 1.0e6) / (if (rng.nextInt(20) == 0) 1.0e12 else 1.0)
+        }
+      }
+
+    val expected: java.lang.Double = {
+      var found = false
+      var currentMin = 0.0
+      values.foreach { x =>
+        if (x != null && !java.lang.Double.isNaN(x)) {
+          if (!found) {
+            currentMin = x; found = true
+          } else if (java.lang.Double.compare(x, currentMin) < 0) currentMin = x
+        }
+      }
+      if (!found) null else currentMin
+    }
+
+    var partStress = agg.init()
+    values.foreach(v => partStress = agg.iterate(partStress, makeTuple(schema, v)))
+    val gotAny = agg.finalAgg(partStress)
+
+    if (expected == null) {
+      assert(gotAny == null)
+    } else {
+      val got = gotAny.asInstanceOf[Number].doubleValue()
+      // exact match: should be one of the seen inputs, no tolerance needed
+      if (
+        expected == 0.0 && java.lang.Double.doubleToRawLongBits(expected) != java.lang.Double
+          .doubleToRawLongBits(got)
+      ) {
+        // If expected is -0.0, enforce it
+        assert(
+          java.lang.Double.doubleToRawLongBits(got) == java.lang.Double.doubleToRawLongBits(
+            expected
+          )
+        )
+      } else {
+        assert(got == expected)
+      }
+    }
+  }
+
+  test("MAX aggregation finds largest DOUBLE value") {
+    val maxValue = 99.144
+    val schema = makeSchema("debt" -> AttributeType.DOUBLE)
+    val tuple1 = makeTuple(schema, -100.123)
+    val tuple2 = makeTuple(schema, 50.12)
+    val tuple3 = makeTuple(schema, maxValue)
+
+    val operation = makeAggregationOp(AggregationFunction.MAX, "debt", "nax_debt")
+    val agg = operation.getAggFunc(AttributeType.DOUBLE)
+
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val result = agg.finalAgg(partial).asInstanceOf[java.lang.Double].doubleValue()
+    assert(result == maxValue)
+  }
+
+  test("AVERAGE aggregation ignores nulls and returns null when all values are null") {
+    val schema = makeSchema("price" -> AttributeType.DOUBLE)
+    val tuple1 = makeTuple(schema, 10.0)
+    val tuple2 = makeTuple(schema, null)
+    val tuple3 = makeTuple(schema, 20.0)
+
+    val operation = makeAggregationOp(AggregationFunction.AVERAGE, "price", "avg_price")
+    val agg = operation.getAggFunc(AttributeType.DOUBLE)
+
+    // Mixed null and non-null
+    var partial = agg.init()
+    partial = agg.iterate(partial, tuple1)
+    partial = agg.iterate(partial, tuple2)
+    partial = agg.iterate(partial, tuple3)
+
+    val avg = agg.finalAgg(partial).asInstanceOf[java.lang.Double].doubleValue()
+    assert(math.abs(avg - 15.0) < 1e-6)
+
+    // All nulls
+    val allNull = makeTuple(schema, null)
+    var partialAllNull = agg.init()
+    partialAllNull = agg.iterate(partialAllNull, allNull)
+    val allNullResult = agg.finalAgg(partialAllNull)
+    assert(allNullResult == null)
+  }
+
+  // ---------------------------------------------------------------------------
+  // getFinal behaviour
+  // ---------------------------------------------------------------------------
+
+  test("getFinal rewrites COUNT into SUM over the intermediate result attribute") {
+    val operation = makeAggregationOp(AggregationFunction.COUNT, "price", "price_count")
+    val finalOp = operation.getFinal
+
+    assert(finalOp.aggFunction == AggregationFunction.SUM)
+    assert(finalOp.attribute == "price_count")
+    assert(finalOp.resultAttribute == "price_count")
+  }
+
+  test("getFinal keeps non-COUNT aggregation function and rewires attribute to resultAttribute") {
+    val operation = makeAggregationOp(AggregationFunction.SUM, "amount", "total_amount")
+    val finalOp = operation.getFinal
+
+    assert(finalOp.aggFunction == AggregationFunction.SUM)
+    assert(finalOp.attribute == "total_amount")
+    assert(finalOp.resultAttribute == "total_amount")
+  }
+
+  // ---------------------------------------------------------------------------
+  // AggregateOpExec: integration-style tests with groupBy
+  // ---------------------------------------------------------------------------
+
+  test("AggregateOpExec groups by a single key and computes SUM per group") {
+    // schema: city (group key), sales
+    val schema = makeSchema(
+      "city" -> AttributeType.STRING,
+      "sales" -> AttributeType.INTEGER
+    )
+
+    val tuple1 = makeTuple(schema, "NY", 10)
+    val tuple2 = makeTuple(schema, "SF", 20)
+    val tuple3 = makeTuple(schema, "NY", 5)
+
+    val desc = new AggregateOpDesc()
+    val sumAgg = makeAggregationOp(AggregationFunction.SUM, "sales", "total_sales")
+    desc.aggregations = List(sumAgg)
+    desc.groupByKeys = List("city")
+
+    val descJson = objectMapper.writeValueAsString(desc)
+
+    val exec = new AggregateOpExec(descJson)
+    exec.open()
+    exec.processTuple(tuple1, 0)
+    exec.processTuple(tuple2, 0)
+    exec.processTuple(tuple3, 0)
+
+    val results = exec.onFinish(0).toList
+
+    // Expect two output rows: (NY, 15) and (SF, 20)
+    val resultMap = results.map { tupleLike =>
+      val fields = tupleLike.getFields
+      val city = fields(0).asInstanceOf[String]
+      val total = fields(1).asInstanceOf[Number].intValue()
+      city -> total
+    }.toMap
+
+    assert(resultMap.size == 2)
+    assert(resultMap("NY") == 15)
+    assert(resultMap("SF") == 20)
+  }
+
+  test("AggregateOpExec performs global SUM and COUNT when there are no groupBy keys") {
+    // schema: region (ignored for aggregation), revenue
+    val schema = makeSchema(
+      "region" -> AttributeType.STRING,
+      "revenue" -> AttributeType.INTEGER
+    )
+
+    val tuple1 = makeTuple(schema, "west", 100)
+    val tuple2 = makeTuple(schema, "east", 200)
+    val tuple3 = makeTuple(schema, "west", 50)
+
+    val desc = new AggregateOpDesc()
+    val sumAgg = makeAggregationOp(AggregationFunction.SUM, "revenue", "total_revenue")
+    val countAgg = makeAggregationOp(AggregationFunction.COUNT, "revenue", "row_count")
+    desc.aggregations = List(sumAgg, countAgg)
+    desc.groupByKeys = List() // global aggregation
+
+    val descJson = objectMapper.writeValueAsString(desc)
+
+    val exec = new AggregateOpExec(descJson)
+    exec.open()
+    exec.processTuple(tuple1, 0)
+    exec.processTuple(tuple2, 0)
+    exec.processTuple(tuple3, 0)
+
+    val results = exec.onFinish(0).toList
+    assert(results.size == 1)
+
+    val fields = results.head.getFields
+    // No group keys, so fields(0) is SUM(revenue), fields(1) is COUNT(revenue)
+    val totalRevenue = fields(0).asInstanceOf[Number].intValue()
+    val rowCount = fields(1).asInstanceOf[Number].intValue()
+
+    assert(totalRevenue == 350)
+    assert(rowCount == 3)
+  }
+}
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala
index 58fc1acdaab..7d753ed7571 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala
@@ -17,17 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.cartesianProduct
-
-import edu.uci.ics.amber.core.tuple.{
-  Attribute,
-  AttributeType,
-  Schema,
-  SchemaEnforceable,
-  Tuple,
-  TupleLike
-}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+package org.apache.texera.amber.operator.cartesianProduct
+
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.workflow.PortIdentity
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala
index 08ad2421882..20a10c9ef53 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.dictionary
+package org.apache.texera.amber.operator.dictionary
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/difference/DifferenceOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/difference/DifferenceOpExecSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/difference/DifferenceOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/difference/DifferenceOpExecSpec.scala
index 022453dc20a..6819ed5259c 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/difference/DifferenceOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/difference/DifferenceOpExecSpec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.difference
+package org.apache.texera.amber.operator.difference
 
+import org.apache.texera.amber.core.tuple._
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike}
 class DifferenceOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
   var input1: Int = 0
   var input2: Int = 1
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/distinct/DistinctOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/distinct/DistinctOpExecSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/distinct/DistinctOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/distinct/DistinctOpExecSpec.scala
index f3f5f5da238..18e9af46fb4 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/distinct/DistinctOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/distinct/DistinctOpExecSpec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.distinct
+package org.apache.texera.amber.operator.distinct
 
+import org.apache.texera.amber.core.tuple._
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike}
 class DistinctOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
   val tupleSchema: Schema = Schema()
     .add(new Attribute("field1", AttributeType.STRING))
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExecSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExecSpec.scala
index c9c2dfe456d..95758fabc90 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExecSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.filter
+package org.apache.texera.amber.operator.filter
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpSpec.scala
similarity index 94%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpSpec.scala
index 118861e87e2..5f99297fb45 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpSpec.scala
@@ -17,22 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.hashJoin
+package org.apache.texera.amber.operator.hashJoin
 
-import edu.uci.ics.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
-import edu.uci.ics.amber.core.tuple.{
-  Attribute,
-  AttributeType,
-  Schema,
-  SchemaEnforceable,
-  Tuple,
-  TupleLike
-}
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.operator.hashJoin.HashJoinBuildOpExec
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
 class HashJoinOpSpec extends AnyFlatSpec with BeforeAndAfter {
   val build: Int = 0
   val probe: Int = 1
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intersect/IntersectOpExecSpec.scala
similarity index 94%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intersect/IntersectOpExecSpec.scala
index bfe346f7f98..5f3c30d0dea 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intersect/IntersectOpExecSpec.scala
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intersect
+package org.apache.texera.amber.operator.intersect
 
-import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity}
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
 import scala.util.Random
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike}
 class IntersectOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
   var opExec: IntersectOpExec = _
   var counter: Int = 0
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intervalJoin/IntervalOpExecSpec.scala
similarity index 97%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intervalJoin/IntervalOpExecSpec.scala
index 9a8da1cae3e..97c60129833 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intervalJoin/IntervalOpExecSpec.scala
@@ -17,25 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.intervalJoin
+package org.apache.texera.amber.operator.intervalJoin
 
-import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity}
+import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
 import java.sql.Timestamp
 import scala.collection.mutable.ArrayBuffer
 import scala.util.Random.{nextInt, nextLong}
-import edu.uci.ics.amber.core.tuple.{
-  Attribute,
-  AttributeType,
-  Schema,
-  SchemaEnforceable,
-  Tuple,
-  TupleLike
-}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
 class IntervalOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
   val left: Int = 0
   val right: Int = 1
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala
similarity index 97%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala
index 52b7c4c6e79..e9e6cc72a69 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.keywordSearch
+package org.apache.texera.amber.operator.keywordSearch
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpDescSpec.scala
similarity index 94%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpDescSpec.scala
index f728e5e3a98..7ba36af7a36 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpDescSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.projection
+package org.apache.texera.amber.operator.projection
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.PortIdentity
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class ProjectionOpDescSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/projection/ProjectionOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpExecSpec.scala
similarity index 97%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/projection/ProjectionOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpExecSpec.scala
index 105ca313d5c..a514f0ab3e8 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/projection/ProjectionOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpExecSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.projection
+package org.apache.texera.amber.operator.projection
 
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class ProjectionOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExecSpec.scala
new file mode 100644
index 00000000000..bd8d41eed0e
--- /dev/null
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExecSpec.scala
@@ -0,0 +1,782 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.sort
+
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.scalatest.flatspec.AnyFlatSpec
+
+import java.sql.Timestamp
+import scala.collection.mutable.{ArrayBuffer, ListBuffer}
+import scala.jdk.CollectionConverters.IterableHasAsJava
+
+/**
+  * Integration and internal-behavior tests for [[StableMergeSortOpExec]].
+  *
+  * Scope & coverage:
+  *  - Single-key semantics across core types (BOOLEAN, INTEGER/LONG, DOUBLE, STRING, TIMESTAMP).
+  *  - Multi-key lexicographic ordering (mixed directions/types) with null/NaN handling.
+  *  - Stability guarantees (relative order preserved for equal keys) and pass-through when no keys.
+  *  - Incremental “bucket stack” invariants (binary-carry sizes; no adjacent equal sizes).
+  *  - Operational properties (buffering behavior, idempotent onFinish, scale sanity).
+  *  - Test hooks for internal merge logic (mergeSortedBuckets, pushBucketAndCombine).
+  *
+  * Null policy:
+  *  - Nulls are always ordered last, regardless of ASC/DESC.
+  *  - NaN participates as a non-null floating value per Double comparison semantics.
+  *
+  * Notes:
+  *  - Some tests rely on package-visible test hooks to validate internals deterministically.
+  */
+class StableMergeSortOpExecSpec extends AnyFlatSpec {
+
+  // ===========================================================================
+  // Helpers
+  // ===========================================================================
+
+  /** Build a Schema with (name, type) pairs, in-order. */
+  private def schemaOf(attributes: (String, AttributeType)*): Schema = {
+    attributes.foldLeft(Schema()) {
+      case (acc, (name, attrType)) => acc.add(new Attribute(name, attrType))
+    }
+  }
+
+  /**
+    * Construct a Tuple for the provided schema.
+    *
+    * @param values map-like varargs: "colName" -> value. Must provide every column.
+    * @throws NoSuchElementException if a provided key is not in the schema.
+    */
+  private def tupleOf(schema: Schema, values: (String, Any)*): Tuple = {
+    val valueMap = values.toMap
+    val builder = Tuple.builder(schema)
+    schema.getAttributeNames.asJava.forEach { name =>
+      builder.add(schema.getAttribute(name), valueMap(name))
+    }
+    builder.build()
+  }
+
+  /** Convenience builder for a single sort key with direction (ASC by default). */
+  private def sortKey(
+      attribute: String,
+      pref: SortPreference = SortPreference.ASC
+  ): SortCriteriaUnit = {
+    val criteria = new SortCriteriaUnit()
+    criteria.attributeName = attribute
+    criteria.sortPreference = pref
+    criteria
+  }
+
+  /** Convert varargs keys into the operator config buffer. */
+  private def sortKeysBuffer(keys: SortCriteriaUnit*): ListBuffer[SortCriteriaUnit] =
+    ListBuffer(keys: _*)
+
+  /**
+    * Run the operator on an in-memory sequence of tuples and capture all output.
+    * Output is only emitted at onFinish to preserve determinism.
+    */
+  private def runStableMergeSort(
+      schema: Schema,
+      tuples: Seq[Tuple]
+  )(configure: StableMergeSortOpDesc => Unit): List[Tuple] = {
+    val desc = new StableMergeSortOpDesc()
+    configure(desc)
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc))
+    exec.open()
+    tuples.foreach(t => exec.processTuple(t, 0))
+    val result = exec.onFinish(0).map(_.asInstanceOf[Tuple]).toList
+    exec.close()
+    result
+  }
+
+  /** Internal test hook to read the current bucket sizes on the stack. */
+  private def getBucketSizes(exec: StableMergeSortOpExec): List[Int] = exec.debugBucketSizes
+
+  /** Decompose an integer into its set-bit powers of two (ascending).
+    * Used to check the binary-carry invariant.
+    */
+  private def binaryDecomposition(number: Int): List[Int] = {
+    var remaining = number
+    val powers = scala.collection.mutable.ListBuffer[Int]()
+    while (remaining > 0) {
+      val lowestSetBit = Integer.lowestOneBit(remaining)
+      powers += lowestSetBit
+      remaining -= lowestSetBit
+    }
+    powers.toList
+  }
+
+  // ===========================================================================
+  // A. Single-key semantics
+  // ===========================================================================
+
+  "StableMergeSortOpExec" should "sort integers ascending and preserve duplicate order" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER, "label" -> AttributeType.STRING)
+    val tuples = List(
+      tupleOf(schema, "value" -> 3, "label" -> "a"),
+      tupleOf(schema, "value" -> 1, "label" -> "first-1"),
+      tupleOf(schema, "value" -> 2, "label" -> "b"),
+      tupleOf(schema, "value" -> 1, "label" -> "first-2"),
+      tupleOf(schema, "value" -> 3, "label" -> "c")
+    )
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("value")) }
+    assert(result.map(_.getField[Int]("value")) == List(1, 1, 2, 3, 3))
+    val labelsForOnes =
+      result.filter(_.getField[Int]("value") == 1).map(_.getField[String]("label"))
+    assert(labelsForOnes == List("first-1", "first-2"))
+  }
+
+  it should "sort integers descending while preserving stability" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER, "label" -> AttributeType.STRING)
+    val tuples = List(
+      tupleOf(schema, "value" -> 2, "label" -> "first"),
+      tupleOf(schema, "value" -> 2, "label" -> "second"),
+      tupleOf(schema, "value" -> 1, "label" -> "third"),
+      tupleOf(schema, "value" -> 3, "label" -> "fourth")
+    )
+    val result = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("value", SortPreference.DESC))
+    }
+    assert(result.map(_.getField[Int]("value")) == List(3, 2, 2, 1))
+    val labelsForTwos =
+      result.filter(_.getField[Int]("value") == 2).map(_.getField[String]("label"))
+    assert(labelsForTwos == List("first", "second"))
+  }
+
+  it should "handle string ordering (case-sensitive)" in {
+    val schema = schemaOf("name" -> AttributeType.STRING)
+    val tuples = List(
+      tupleOf(schema, "name" -> "apple"),
+      tupleOf(schema, "name" -> "Banana"),
+      tupleOf(schema, "name" -> "banana"),
+      tupleOf(schema, "name" -> "APPLE")
+    )
+    val sorted = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("name", SortPreference.ASC))
+    }
+    assert(sorted.map(_.getField[String]("name")) == List("APPLE", "Banana", "apple", "banana"))
+  }
+
+  it should "order ASCII strings by Java compareTo (punctuation < digits < uppercase < lowercase)" in {
+    val schema = schemaOf("str" -> AttributeType.STRING)
+    val tuples = List("a", "A", "0", "~", "!").map(s => tupleOf(schema, "str" -> s))
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("str")) }
+    assert(result.map(_.getField[String]("str")) == List("!", "0", "A", "a", "~"))
+  }
+
+  it should "sort negatives and zeros correctly" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val tuples = List(0, -1, -10, 5, -3, 2).map(v => tupleOf(schema, "value" -> v))
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("value")) }
+    assert(result.map(_.getField[Int]("value")) == List(-10, -3, -1, 0, 2, 5))
+  }
+
+  it should "sort LONG values ascending" in {
+    val schema = schemaOf("id" -> AttributeType.LONG)
+    val tuples = List(5L, 1L, 3L, 9L, 0L).map(v => tupleOf(schema, "id" -> v))
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("id")) }
+    assert(result.map(_.getField[Long]("id")) == List(0L, 1L, 3L, 5L, 9L))
+  }
+
+  it should "sort TIMESTAMP ascending" in {
+    val schema = schemaOf("timestamp" -> AttributeType.TIMESTAMP)
+    val base = Timestamp.valueOf("2022-01-01 00:00:00")
+    val tuples = List(
+      new Timestamp(base.getTime + 4000),
+      new Timestamp(base.getTime + 1000),
+      new Timestamp(base.getTime + 3000),
+      new Timestamp(base.getTime + 2000)
+    ).map(ts => tupleOf(schema, "timestamp" -> ts))
+    val result = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("timestamp", SortPreference.ASC))
+    }
+    val times = result.map(_.getField[Timestamp]("timestamp").getTime)
+    assert(times == times.sorted)
+  }
+
+  it should "sort TIMESTAMP descending" in {
+    val schema = schemaOf("timestamp" -> AttributeType.TIMESTAMP)
+    val base = Timestamp.valueOf("2023-01-01 00:00:00")
+    val tuples = List(
+      new Timestamp(base.getTime + 3000),
+      base,
+      new Timestamp(base.getTime + 1000),
+      new Timestamp(base.getTime + 2000)
+    ).map(ts => tupleOf(schema, "timestamp" -> ts))
+    val result = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("timestamp", SortPreference.DESC))
+    }
+    val times = result.map(_.getField[Timestamp]("timestamp").getTime)
+    assert(times == times.sorted(Ordering.Long.reverse))
+  }
+
+  it should "treat numeric strings as strings (lexicographic ordering)" in {
+    val schema = schemaOf("str" -> AttributeType.STRING)
+    val tuples = List("2", "10", "1", "11", "20").map(s => tupleOf(schema, "str" -> s))
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("str")) }
+    assert(result.map(_.getField[String]("str")) == List("1", "10", "11", "2", "20"))
+  }
+
+  it should "sort BOOLEAN ascending (false < true) and descending" in {
+    val schema = schemaOf("bool" -> AttributeType.BOOLEAN)
+    val tuples = List(true, false, true, false).map(v => tupleOf(schema, "bool" -> v))
+    val asc = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("bool", SortPreference.ASC))
+    }
+    assert(asc.map(_.getField[Boolean]("bool")) == List(false, false, true, true))
+    val desc = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("bool", SortPreference.DESC))
+    }
+    assert(desc.map(_.getField[Boolean]("bool")) == List(true, true, false, false))
+  }
+
+  it should "sort BINARY ascending (unsigned lexicographic) incl. empty and high-bit bytes" in {
+    val schema = schemaOf("bin" -> AttributeType.BINARY)
+
+    val bytesEmpty = Array[Byte]() // []
+    val bytes00 = Array(0x00.toByte) // [00]
+    val bytes0000 = Array(0x00.toByte, 0x00.toByte) // [00,00]
+    val bytes0001 = Array(0x00.toByte, 0x01.toByte) // [00,01]
+    val bytes7F = Array(0x7f.toByte) // [7F]
+    val bytes80 = Array(0x80.toByte) // [80] (-128)
+    val bytesFF = Array(0xff.toByte) // [FF] (-1)
+
+    val inputTuples = List(bytes80, bytes0000, bytesEmpty, bytesFF, bytes0001, bytes00, bytes7F)
+      .map(arr => tupleOf(schema, "bin" -> arr))
+
+    val sorted = runStableMergeSort(schema, inputTuples) { _.keys = sortKeysBuffer(sortKey("bin")) }
+
+    val actualUnsigned = sorted.map(_.getField[Array[Byte]]("bin").toSeq.map(b => b & 0xff))
+    val expectedUnsigned =
+      List(bytesEmpty, bytes00, bytes0000, bytes0001, bytes7F, bytes80, bytesFF)
+        .map(_.toSeq.map(b => b & 0xff))
+
+    assert(actualUnsigned == expectedUnsigned)
+  }
+
+  // ===========================================================================
+  // B. Floating-point & Null/NaN policy
+  // ===========================================================================
+
+  it should "sort DOUBLE values including -0.0, 0.0, infinities and NaN" in {
+    val schema = schemaOf("x" -> AttributeType.DOUBLE)
+    val tuples =
+      List(Double.NaN, Double.PositiveInfinity, 1.5, -0.0, 0.0, -3.2, Double.NegativeInfinity)
+        .map(v => tupleOf(schema, "x" -> v))
+    val result = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("x"))
+    }
+    val values = result.map(_.getField[Double]("x"))
+    assert(values.head == Double.NegativeInfinity)
+    assert(values(1) == -3.2)
+    assert(java.lang.Double.compare(values(2), -0.0) == 0)
+    assert(java.lang.Double.compare(values(3), 0.0) == 0)
+    assert(values(4) == 1.5)
+    assert(values(5) == Double.PositiveInfinity)
+    assert(java.lang.Double.isNaN(values(6)))
+  }
+
+  it should "place NaN before null when sorting DOUBLE ascending (nulls last policy)" in {
+    val schema = schemaOf("x" -> AttributeType.DOUBLE)
+    val tuples = List(
+      tupleOf(schema, "x" -> null),
+      tupleOf(schema, "x" -> Double.NaN),
+      tupleOf(schema, "x" -> Double.NegativeInfinity),
+      tupleOf(schema, "x" -> 1.0),
+      tupleOf(schema, "x" -> Double.PositiveInfinity),
+      tupleOf(schema, "x" -> null)
+    )
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("x")) }
+    val values = result.map(_.getField[java.lang.Double]("x"))
+    assert(values.take(4).forall(_ != null)) // first 4 are non-null
+    assert(values(0).isInfinite && values(0) == Double.NegativeInfinity)
+    assert(values(1) == 1.0)
+    assert(values(2).isInfinite && values(2) == Double.PositiveInfinity)
+    assert(java.lang.Double.isNaN(values(3)))
+    assert(values.drop(4).forall(_ == null))
+  }
+
+  it should "place nulls last regardless of ascending or descending" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER, "label" -> AttributeType.STRING)
+    val tuples = List(
+      tupleOf(schema, "value" -> null, "label" -> "null-1"),
+      tupleOf(schema, "value" -> 5, "label" -> "five"),
+      tupleOf(schema, "value" -> null, "label" -> "null-2"),
+      tupleOf(schema, "value" -> 3, "label" -> "three")
+    )
+    val asc = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("value", SortPreference.ASC))
+    }
+    assert(asc.map(_.getField[String]("label")) == List("three", "five", "null-1", "null-2"))
+
+    val desc = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("value", SortPreference.DESC))
+    }
+    assert(desc.map(_.getField[String]("label")) == List("five", "three", "null-1", "null-2"))
+  }
+
+  it should "order NaN highest on secondary DESC but still place nulls last" in {
+    val schema = schemaOf(
+      "group" -> AttributeType.STRING,
+      "score" -> AttributeType.DOUBLE,
+      "label" -> AttributeType.STRING
+    )
+    val tuples = List(
+      tupleOf(schema, "group" -> "A", "score" -> java.lang.Double.NaN, "label" -> "nan"),
+      tupleOf(schema, "group" -> "A", "score" -> Double.PositiveInfinity, "label" -> "pinf"),
+      tupleOf(schema, "group" -> "A", "score" -> 1.0, "label" -> "one"),
+      tupleOf(schema, "group" -> "A", "score" -> 0.0, "label" -> "zero"),
+      tupleOf(schema, "group" -> "A", "score" -> -1.0, "label" -> "neg"),
+      tupleOf(schema, "group" -> "A", "score" -> Double.NegativeInfinity, "label" -> "ninf"),
+      tupleOf(schema, "group" -> "A", "score" -> null, "label" -> "null-1"),
+      tupleOf(schema, "group" -> "A", "score" -> null, "label" -> "null-2")
+    )
+    val result = runStableMergeSort(schema, tuples) { desc =>
+      desc.keys =
+        sortKeysBuffer(sortKey("group", SortPreference.ASC), sortKey("score", SortPreference.DESC))
+    }
+    assert(
+      result.map(_.getField[String]("label")) ==
+        List("nan", "pinf", "one", "zero", "neg", "ninf", "null-1", "null-2")
+    )
+  }
+
+  it should "sort BINARY descending with nulls last and preserve stability for equal byte arrays" in {
+    val schema = schemaOf("bin" -> AttributeType.BINARY, "id" -> AttributeType.STRING)
+
+    val key00 = Array(0x00.toByte)
+    val keyFF = Array(0xff.toByte)
+
+    val inputTuples = List(
+      tupleOf(schema, "bin" -> keyFF, "id" -> "ff-1"),
+      tupleOf(schema, "bin" -> key00, "id" -> "00-1"),
+      tupleOf(
+        schema,
+        "bin" -> key00,
+        "id" -> "00-2"
+      ), // equal to previous; stability should keep order
+      tupleOf(schema, "bin" -> null, "id" -> "null-1")
+    )
+
+    val sorted = runStableMergeSort(schema, inputTuples) {
+      _.keys = sortKeysBuffer(sortKey("bin", SortPreference.DESC))
+    }
+
+    val idsInOrder = sorted.map(_.getField[String]("id"))
+    assert(idsInOrder == List("ff-1", "00-1", "00-2", "null-1"))
+  }
+  // ===========================================================================
+  // C. Multi-key semantics (lexicographic)
+  // ===========================================================================
+
+  it should "support multi-key sorting with mixed attribute types" in {
+    val schema = schemaOf(
+      "dept" -> AttributeType.STRING,
+      "score" -> AttributeType.DOUBLE,
+      "name" -> AttributeType.STRING,
+      "hired" -> AttributeType.TIMESTAMP
+    )
+    val base = new Timestamp(Timestamp.valueOf("2020-01-01 00:00:00").getTime)
+    val tuples = List(
+      tupleOf(schema, "dept" -> "Sales", "score" -> 9.5, "name" -> "Alice", "hired" -> base),
+      tupleOf(
+        schema,
+        "dept" -> "Sales",
+        "score" -> 9.5,
+        "name" -> "Bob",
+        "hired" -> new Timestamp(base.getTime + 1000)
+      ),
+      tupleOf(
+        schema,
+        "dept" -> "Sales",
+        "score" -> 8.0,
+        "name" -> "Carol",
+        "hired" -> new Timestamp(base.getTime + 2000)
+      ),
+      tupleOf(
+        schema,
+        "dept" -> "Engineering",
+        "score" -> 9.5,
+        "name" -> "Dave",
+        "hired" -> new Timestamp(base.getTime + 3000)
+      ),
+      tupleOf(
+        schema,
+        "dept" -> null,
+        "score" -> 9.5,
+        "name" -> "Eve",
+        "hired" -> new Timestamp(base.getTime + 4000)
+      )
+    )
+    val result = runStableMergeSort(schema, tuples) { desc =>
+      desc.keys = sortKeysBuffer(
+        sortKey("dept", SortPreference.ASC),
+        sortKey("score", SortPreference.DESC),
+        sortKey("name", SortPreference.ASC)
+      )
+    }
+    assert(result.map(_.getField[String]("name")) == List("Dave", "Alice", "Bob", "Carol", "Eve"))
+  }
+
+  it should "handle multi-key with descending primary and ascending secondary" in {
+    val schema = schemaOf(
+      "major" -> AttributeType.INTEGER,
+      "minor" -> AttributeType.INTEGER,
+      "idx" -> AttributeType.INTEGER
+    )
+    val tuples = List(
+      (1, 9, 0),
+      (1, 1, 1),
+      (2, 5, 2),
+      (2, 3, 3),
+      (1, 1, 4),
+      (3, 0, 5),
+      (3, 2, 6)
+    ).map { case (ma, mi, i) => tupleOf(schema, "major" -> ma, "minor" -> mi, "idx" -> i) }
+    val result = runStableMergeSort(schema, tuples) { desc =>
+      desc.keys =
+        sortKeysBuffer(sortKey("major", SortPreference.DESC), sortKey("minor", SortPreference.ASC))
+    }
+    val pairs = result.map(t => (t.getField[Int]("major"), t.getField[Int]("minor")))
+    assert(pairs == List((3, 0), (3, 2), (2, 3), (2, 5), (1, 1), (1, 1), (1, 9)))
+    val idxFor11 = result
+      .filter(t => t.getField[Int]("major") == 1 && t.getField[Int]("minor") == 1)
+      .map(_.getField[Int]("idx"))
+    assert(idxFor11 == List(1, 4))
+  }
+
+  it should "use the third key as a tiebreaker (ASC, ASC, then DESC)" in {
+    val schema = schemaOf(
+      "keyA" -> AttributeType.INTEGER,
+      "keyB" -> AttributeType.INTEGER,
+      "keyC" -> AttributeType.INTEGER,
+      "id" -> AttributeType.STRING
+    )
+    val tuples = List(
+      (1, 1, 1, "x1"),
+      (1, 1, 3, "x3"),
+      (1, 1, 2, "x2"),
+      (1, 0, 9, "y9")
+    ).map {
+      case (a, b, c, id) => tupleOf(schema, "keyA" -> a, "keyB" -> b, "keyC" -> c, "id" -> id)
+    }
+    val result = runStableMergeSort(schema, tuples) {
+      _.keys =
+        sortKeysBuffer(sortKey("keyA"), sortKey("keyB"), sortKey("keyC", SortPreference.DESC))
+    }
+    assert(result.map(_.getField[String]("id")) == List("y9", "x3", "x2", "x1"))
+  }
+
+  it should "place nulls last across multiple keys (primary ASC, secondary DESC)" in {
+    val schema = schemaOf("keyA" -> AttributeType.STRING, "keyB" -> AttributeType.INTEGER)
+    val tuples = List(
+      ("x", 2),
+      (null, 1),
+      ("x", 1),
+      (null, 5),
+      ("a", 9),
+      ("a", 2)
+    ).map { case (s, i) => tupleOf(schema, "keyA" -> s, "keyB" -> i) }
+    val result = runStableMergeSort(schema, tuples) { desc =>
+      desc.keys =
+        sortKeysBuffer(sortKey("keyA", SortPreference.ASC), sortKey("keyB", SortPreference.DESC))
+    }
+    val out = result.map(t => (t.getField[String]("keyA"), t.getField[Int]("keyB")))
+    assert(out == List(("a", 9), ("a", 2), ("x", 2), ("x", 1), (null, 5), (null, 1)))
+  }
+
+  it should "when primary keys are both null, fall back to secondary ASC (nulls still after non-nulls)" in {
+    val schema = schemaOf(
+      "keyA" -> AttributeType.STRING,
+      "keyB" -> AttributeType.INTEGER,
+      "id" -> AttributeType.STRING
+    )
+    val tuples = List(
+      tupleOf(schema, "keyA" -> "A", "keyB" -> 2, "id" -> "non-null-a"),
+      tupleOf(schema, "keyA" -> null, "keyB" -> 5, "id" -> "null-a-5"),
+      tupleOf(schema, "keyA" -> null, "keyB" -> 1, "id" -> "null-a-1"),
+      tupleOf(schema, "keyA" -> "B", "keyB" -> 9, "id" -> "non-null-b")
+    )
+    val result = runStableMergeSort(schema, tuples) {
+      _.keys = sortKeysBuffer(sortKey("keyA"), sortKey("keyB"))
+    }
+    assert(
+      result
+        .map(_.getField[String]("id")) == List("non-null-a", "non-null-b", "null-a-1", "null-a-5")
+    )
+  }
+
+  it should "use INTEGER secondary key to break ties when primary BINARY keys are equal" in {
+    val schema = schemaOf(
+      "bin" -> AttributeType.BINARY,
+      "score" -> AttributeType.INTEGER,
+      "label" -> AttributeType.STRING
+    )
+
+    val key00 = Array(0x00.toByte)
+    val key01 = Array(0x01.toByte)
+
+    val inputTuples = List(
+      tupleOf(schema, "bin" -> key01, "score" -> 1, "label" -> "01-score1"),
+      tupleOf(schema, "bin" -> key00, "score" -> 9, "label" -> "00-score9"),
+      tupleOf(schema, "bin" -> key01, "score" -> 2, "label" -> "01-score2")
+    )
+
+    val sorted = runStableMergeSort(schema, inputTuples) { desc =>
+      desc.keys = sortKeysBuffer(
+        sortKey("bin", SortPreference.ASC), // primary: binary ascending
+        sortKey("score", SortPreference.DESC) // secondary: integer descending
+      )
+    }
+
+    val labelsInOrder = sorted.map(_.getField[String]("label"))
+    assert(labelsInOrder == List("00-score9", "01-score2", "01-score1"))
+  }
+  // ===========================================================================
+  // D. Stability & operational behaviors
+  // ===========================================================================
+
+  it should "preserve original order among tuples with equal keys" in {
+    val schema = schemaOf("key" -> AttributeType.INTEGER, "index" -> AttributeType.INTEGER)
+    val tuples = (0 until 100).map(i => tupleOf(schema, "key" -> (i % 5), "index" -> i))
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("key")) }
+    val grouped = result.groupBy(_.getField[Int]("key")).values
+    grouped.foreach { group =>
+      val indices = group.map(_.getField[Int]("index"))
+      assert(indices == indices.sorted)
+    }
+  }
+
+  it should "act as a stable pass-through when keys are empty" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER, "label" -> AttributeType.STRING)
+    val tuples = List(3, 1, 4, 1, 5, 9).zipWithIndex
+      .map { case (v, i) => tupleOf(schema, "value" -> v, "label" -> s"row-$i") }
+    val result = runStableMergeSort(schema, tuples) { desc =>
+      desc.keys = ListBuffer.empty[SortCriteriaUnit]
+    }
+    assert(
+      result.map(_.getField[String]("label")) ==
+        List("row-0", "row-1", "row-2", "row-3", "row-4", "row-5")
+    )
+  }
+
+  it should "buffer tuples until onFinish is called" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val tuple = tupleOf(schema, "value" -> 2)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc))
+    exec.open()
+    val immediate = exec.processTuple(tuple, 0)
+    assert(immediate.isEmpty)
+    val result = exec.onFinish(0).map(_.asInstanceOf[Tuple]).toList
+    assert(result.map(_.getField[Int]("value")) == List(2))
+    exec.close()
+  }
+
+  it should "return empty for empty input" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val result = runStableMergeSort(schema, Seq.empty) { _.keys = sortKeysBuffer(sortKey("value")) }
+    assert(result.isEmpty)
+  }
+
+  it should "handle single element input" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val result = runStableMergeSort(schema, Seq(tupleOf(schema, "value" -> 42))) {
+      _.keys = sortKeysBuffer(sortKey("value"))
+    }
+    assert(result.map(_.getField[Int]("value")) == List(42))
+  }
+
+  it should "sort large inputs efficiently (sanity on boundaries)" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER, "label" -> AttributeType.STRING)
+    val tuples = (50000 to 1 by -1).map(i => tupleOf(schema, "value" -> i, "label" -> s"row-$i"))
+    val result = runStableMergeSort(schema, tuples) { _.keys = sortKeysBuffer(sortKey("value")) }
+    assert(result.head.getField[Int]("value") == 1)
+    assert(result(1).getField[Int]("value") == 2)
+    assert(result.takeRight(2).map(_.getField[Int]("value")) == List(49999, 50000))
+  }
+
+  // ===========================================================================
+  // E. Incremental bucket invariants (binary-carry & no-adjacent-equal)
+  // ===========================================================================
+
+  it should "merge incrementally: bucket sizes match binary decomposition after each push" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc))
+    exec.open()
+
+    val totalCount = 64
+    for (index <- (totalCount - 1) to 0 by -1) {
+      exec.processTuple(tupleOf(schema, "value" -> index), 0)
+      val sizes = getBucketSizes(exec).sorted
+      assert(sizes == binaryDecomposition(totalCount - index))
+    }
+
+    exec.close()
+  }
+
+  it should "maintain bucket-stack invariant (no adjacent equal sizes) after each insertion" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc))
+    exec.open()
+
+    val totalCount = 200
+    val stream = (0 until totalCount by 2) ++ (1 until totalCount by 2)
+    stream.foreach { index =>
+      exec.processTuple(tupleOf(schema, "value" -> (totalCount - 1 - index)), 0)
+      val sizes = getBucketSizes(exec)
+      sizes.sliding(2).foreach { pair =>
+        if (pair.length == 2) assert(pair.head != pair.last)
+      }
+    }
+
+    exec.close()
+  }
+
+  it should "form expected bucket sizes at milestones (1,2,3,4,7,8,15,16)" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc))
+    exec.open()
+
+    val inputSequence = (100 to 1 by -1).map(i => tupleOf(schema, "value" -> i))
+    val milestones = Set(1, 2, 3, 4, 7, 8, 15, 16)
+    var pushed = 0
+    inputSequence.foreach { t =>
+      exec.processTuple(t, 0); pushed += 1
+      if (milestones.contains(pushed)) {
+        val sizes = getBucketSizes(exec).sorted
+        assert(sizes == binaryDecomposition(pushed))
+      }
+    }
+
+    exec.close()
+  }
+
+  // ===========================================================================
+  // F. Internal hooks — merge behavior
+  // ===========================================================================
+
+  "mergeSortedBuckets" should "be stable: left bucket wins on equal keys" in {
+    val schema = schemaOf("key" -> AttributeType.INTEGER, "id" -> AttributeType.STRING)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("key"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc)); exec.open()
+
+    // Seed to resolve schema/keys once.
+    exec.processTuple(tupleOf(schema, "key" -> 0, "id" -> "seed"), 0)
+
+    val left = ArrayBuffer(
+      tupleOf(schema, "key" -> 1, "id" -> "L1"),
+      tupleOf(schema, "key" -> 2, "id" -> "L2")
+    )
+    val right = ArrayBuffer(
+      tupleOf(schema, "key" -> 1, "id" -> "R1"),
+      tupleOf(schema, "key" -> 3, "id" -> "R3")
+    )
+
+    val merged = exec.mergeSortedBuckets(left, right)
+    val ids = merged.map(_.getField[String]("id")).toList
+    assert(ids == List("L1", "R1", "L2", "R3"))
+    exec.close()
+  }
+
+  "mergeSortedBuckets" should "handle empty left bucket" in {
+    val schema = schemaOf("key" -> AttributeType.INTEGER, "id" -> AttributeType.STRING)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("key"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc)); exec.open()
+    exec.processTuple(tupleOf(schema, "key" -> 0, "id" -> "seed"), 0) // seed keys
+
+    val left = ArrayBuffer.empty[Tuple]
+    val right = ArrayBuffer(
+      tupleOf(schema, "key" -> 1, "id" -> "r1"),
+      tupleOf(schema, "key" -> 2, "id" -> "r2")
+    )
+    val merged = exec.mergeSortedBuckets(left, right)
+    assert(merged.map(_.getField[String]("id")).toList == List("r1", "r2"))
+    exec.close()
+  }
+
+  "mergeSortedBuckets" should "handle empty right bucket" in {
+    val schema = schemaOf("key" -> AttributeType.INTEGER, "id" -> AttributeType.STRING)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("key"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc)); exec.open()
+    exec.processTuple(tupleOf(schema, "key" -> 0, "id" -> "seed"), 0)
+
+    val left = ArrayBuffer(
+      tupleOf(schema, "key" -> 1, "id" -> "l1"),
+      tupleOf(schema, "key" -> 2, "id" -> "l2")
+    )
+    val right = ArrayBuffer.empty[Tuple]
+    val merged = exec.mergeSortedBuckets(left, right)
+    assert(merged.map(_.getField[String]("id")).toList == List("l1", "l2"))
+    exec.close()
+  }
+
+  // ===========================================================================
+  // G. Internal hooks — push/finish/idempotence & schema errors
+  // ===========================================================================
+
+  "pushBucketAndCombine" should "merge two size-2 buckets into size-4 on push (with existing size-1 seed)" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc)); exec.open()
+
+    // seed to compile keys -> results in one size-1 bucket in the stack
+    exec.processTuple(tupleOf(schema, "value" -> 0), 0)
+
+    // two pre-sorted buckets of size 2
+    val bucket1 = ArrayBuffer(tupleOf(schema, "value" -> 1), tupleOf(schema, "value" -> 3))
+    val bucket2 = ArrayBuffer(tupleOf(schema, "value" -> 2), tupleOf(schema, "value" -> 4))
+
+    exec.pushBucketAndCombine(bucket1) // sizes now [1,2]
+    exec.pushBucketAndCombine(bucket2) // equal top [2,2] => merged to 4; sizes [1,4]
+
+    val sizes = getBucketSizes(exec)
+    assert(sizes == List(1, 4))
+    exec.close()
+  }
+
+  it should "return the same sorted output if onFinish is called twice in a row" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc)); exec.open()
+    List(3, 1, 2).foreach(i => exec.processTuple(tupleOf(schema, "value" -> i), 0))
+
+    val first = exec.onFinish(0).map(_.asInstanceOf[Tuple]).toList.map(_.getField[Int]("value"))
+    val second = exec.onFinish(0).map(_.asInstanceOf[Tuple]).toList.map(_.getField[Int]("value"))
+    assert(first == List(1, 2, 3))
+    assert(second == List(1, 2, 3))
+    exec.close()
+  }
+
+  it should "have processTuple always return empty iterators until finish" in {
+    val schema = schemaOf("value" -> AttributeType.INTEGER)
+    val desc = new StableMergeSortOpDesc(); desc.keys = sortKeysBuffer(sortKey("value"))
+    val exec = new StableMergeSortOpExec(objectMapper.writeValueAsString(desc)); exec.open()
+    val immediates = (10 to 1 by -1).map(i => exec.processTuple(tupleOf(schema, "value" -> i), 0))
+    assert(immediates.forall(_.isEmpty))
+    val out = exec.onFinish(0).map(_.asInstanceOf[Tuple]).toList.map(_.getField[Int]("value"))
+    assert(out == (1 to 10).toList)
+    exec.close()
+  }
+
+}
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala
similarity index 93%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala
index c91f776791c..afa9bda8180 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.sortPartitions
+package org.apache.texera.amber.operator.sortPartitions
 
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class SortPartitionsOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala
similarity index 92%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala
index 746db4a099f..c61468c6832 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.fetcher
+package org.apache.texera.amber.operator.source.fetcher
 
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class URLFetcherOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExecSpec.scala
new file mode 100644
index 00000000000..ab3383ca0ad
--- /dev/null
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExecSpec.scala
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.amber.operator.source.scan
+
+import org.apache.texera.amber.core.tuple.{AttributeType, LargeBinary, Schema, SchemaEnforceable}
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.flatspec.AnyFlatSpec
+
+import java.io.{BufferedOutputStream, FileOutputStream}
+import java.net.URI
+import java.nio.file.{Files, Path}
+import java.util.zip.{ZipEntry, ZipOutputStream}
+
+/**
+  * Unit tests for LARGE_BINARY logic in FileScanSourceOpExec.
+  * Full integration tests with S3 and database are in LargeBinaryManagerSpec.
+  */
+class FileScanSourceOpExecSpec extends AnyFlatSpec with BeforeAndAfterAll {
+
+  private val testDir = Path
+    .of(sys.env.getOrElse("TEXERA_HOME", "."))
+    .resolve("common/workflow-operator/src/test/resources")
+    .toRealPath()
+
+  private val testFile = testDir.resolve("test_large_binary.txt")
+  private val testZip = testDir.resolve("test_large_binary.zip")
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    Files.write(testFile, "Test content\nLine 2\nLine 3".getBytes)
+    createZipFile(testZip, Map("file1.txt" -> "Content 1", "file2.txt" -> "Content 2"))
+  }
+
+  override def afterAll(): Unit = {
+    Files.deleteIfExists(testFile)
+    Files.deleteIfExists(testZip)
+    super.afterAll()
+  }
+
+  private def createZipFile(path: Path, entries: Map[String, String]): Unit = {
+    val zipOut = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(path.toFile)))
+    try {
+      entries.foreach {
+        case (name, content) =>
+          zipOut.putNextEntry(new ZipEntry(name))
+          zipOut.write(content.getBytes)
+          zipOut.closeEntry()
+      }
+    } finally {
+      zipOut.close()
+    }
+  }
+
+  private def createDescriptor(
+      file: Path = testFile,
+      attributeName: String = "line"
+  ): FileScanSourceOpDesc = {
+    val desc = new FileScanSourceOpDesc()
+    desc.fileName = Some(file.toString)
+    desc.attributeType = FileAttributeType.LARGE_BINARY
+    desc.attributeName = attributeName
+    desc.fileEncoding = FileDecodingMethod.UTF_8
+    desc
+  }
+
+  private def assertSchema(schema: Schema, attributeName: String): Unit = {
+    assert(schema.getAttributes.length == 1)
+    assert(schema.getAttribute(attributeName).getType == AttributeType.LARGE_BINARY)
+  }
+
+  // Schema Tests
+  it should "infer LARGE_BINARY schema with default attribute name" in {
+    assertSchema(createDescriptor().sourceSchema(), "line")
+  }
+
+  it should "infer LARGE_BINARY schema with custom attribute name" in {
+    assertSchema(createDescriptor(attributeName = "custom_field").sourceSchema(), "custom_field")
+  }
+
+  it should "map LARGE_BINARY to correct AttributeType" in {
+    assert(FileAttributeType.LARGE_BINARY.getType == AttributeType.LARGE_BINARY)
+  }
+
+  // Type Classification Tests
+  it should "correctly classify LARGE_BINARY as isSingle type" in {
+    val isSingleTypes = List(
+      FileAttributeType.LARGE_BINARY,
+      FileAttributeType.SINGLE_STRING,
+      FileAttributeType.BINARY
+    )
+    val multiLineTypes = List(
+      FileAttributeType.STRING,
+      FileAttributeType.INTEGER,
+      FileAttributeType.LONG,
+      FileAttributeType.DOUBLE,
+      FileAttributeType.BOOLEAN,
+      FileAttributeType.TIMESTAMP
+    )
+
+    isSingleTypes.foreach(t => assert(t.isSingle, s"$t should be isSingle"))
+    multiLineTypes.foreach(t => assert(!t.isSingle, s"$t should not be isSingle"))
+  }
+
+  // Execution Tests
+  it should "create LargeBinary when reading file with LARGE_BINARY type" in {
+    val desc = createDescriptor()
+    desc.setResolvedFileName(URI.create(testFile.toUri.toString))
+
+    val executor = new FileScanSourceOpExec(objectMapper.writeValueAsString(desc))
+
+    try {
+      executor.open()
+      val tuples = executor.produceTuple().toSeq
+      executor.close()
+
+      assert(tuples.size == 1)
+      val field = tuples.head
+        .asInstanceOf[SchemaEnforceable]
+        .enforceSchema(desc.sourceSchema())
+        .getField[Any]("line")
+
+      assert(field.isInstanceOf[LargeBinary])
+      assert(field.asInstanceOf[LargeBinary].getUri.startsWith("s3://"))
+    } catch {
+      case e: Exception =>
+        info(s"S3 not configured: ${e.getMessage}")
+    }
+  }
+
+  // LargeBinary Tests
+  it should "create valid LargeBinary with correct URI parsing" in {
+    val pointer = new LargeBinary("s3://bucket/path/to/object")
+
+    assert(pointer.getUri == "s3://bucket/path/to/object")
+    assert(pointer.getBucketName == "bucket")
+    assert(pointer.getObjectKey == "path/to/object")
+  }
+
+  it should "reject invalid LargeBinary URIs" in {
+    assertThrows[IllegalArgumentException](new LargeBinary("http://invalid"))
+    assertThrows[IllegalArgumentException](new LargeBinary("not-a-uri"))
+    assertThrows[IllegalArgumentException](new LargeBinary(null.asInstanceOf[String]))
+  }
+}
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala
similarity index 93%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala
index 15fb0d7d5e4..96161672bac 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala
@@ -17,12 +17,15 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.csv
+package org.apache.texera.amber.operator.source.scan.csv
 
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID}
-import edu.uci.ics.amber.operator.TestOperators
+import org.apache.texera.amber.core.storage.FileResolver
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.WorkflowContext.{
+  DEFAULT_EXECUTION_ID,
+  DEFAULT_WORKFLOW_ID
+}
+import org.apache.texera.amber.operator.TestOperators
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala
index be8e5135562..8c086867052 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.text
+package org.apache.texera.amber.operator.source.scan.text
 
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple}
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.operator.source.scan.{
+import org.apache.texera.amber.core.storage.FileResolver
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple}
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.amber.operator.source.scan.{
   FileAttributeType,
   FileDecodingMethod,
   FileScanSourceOpDesc,
   FileScanSourceOpExec
 }
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala
index 1466a6e5b9b..d1b5a5f94ad 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.source.scan.text
+package org.apache.texera.amber.operator.source.scan.text
 
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple}
-import edu.uci.ics.amber.operator.TestOperators
-import edu.uci.ics.amber.operator.source.scan.FileAttributeType
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple}
+import org.apache.texera.amber.operator.TestOperators
+import org.apache.texera.amber.operator.source.scan.FileAttributeType
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala
index f8c068f2e1a..7e263debe76 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala
@@ -17,18 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.symmetricDifference
+package org.apache.texera.amber.operator.symmetricDifference
 
+import org.apache.texera.amber.core.tuple._
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
-import edu.uci.ics.amber.core.tuple.{
-  Attribute,
-  AttributeType,
-  Schema,
-  SchemaEnforceable,
-  Tuple,
-  TupleLike
-}
 class SymmetricDifferenceOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
   var opExec: SymmetricDifferenceOpExec = _
   var counter: Int = 0
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExecSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExecSpec.scala
index 977c5928816..02b710a849d 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExecSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.typecasting
+package org.apache.texera.amber.operator.typecasting
 
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class TypeCastingOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala
similarity index 94%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala
index 5f8f4e2ad90..9a51257cc01 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.udf.python
+package org.apache.texera.amber.operator.udf.python
 
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema}
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
+import org.apache.texera.amber.core.workflow.PortIdentity
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class PythonLambdaFunctionOpDescSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExecSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExecSpec.scala
index ad9dc7dc582..a746180c55d 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExecSpec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.unneststring
+package org.apache.texera.amber.operator.unneststring
 
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class UnnestStringOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala
index 3edb4b6f7a7..df1f4792cdd 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.DotPlot
+package org.apache.texera.amber.operator.visualization.DotPlot
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala
similarity index 94%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala
index 3dd719eafb4..266f14e4d8a 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.ImageViz
+package org.apache.texera.amber.operator.visualization.ImageViz
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDescSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDescSpec.scala
index 04ab39afb2e..8e16d761919 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.barChart
+package org.apache.texera.amber.operator.visualization.barChart
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala
index 2b83fe972fd..e03babbddb2 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.bubbleChart
+package org.apache.texera.amber.operator.visualization.bubbleChart
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala
index d9e2034abe4..244f65c60cb 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.filledAreaPlot
+package org.apache.texera.amber.operator.visualization.filledAreaPlot
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala
similarity index 97%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala
index ae88a43badf..9a3461121e3 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.ganttChart
+package org.apache.texera.amber.operator.visualization.ganttChart
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala
similarity index 96%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala
index 4416488b67b..7e11d005bb6 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.hierarchychart
+package org.apache.texera.amber.operator.visualization.hierarchychart
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala
similarity index 91%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala
index f882dd786df..05fb87556cd 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.htmlviz
+package org.apache.texera.amber.operator.visualization.htmlviz
 
-import edu.uci.ics.amber.core.tuple._
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.core.tuple._
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.util.JSONUtils.objectMapper
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
 class HtmlVizOpExecSpec extends AnyFlatSpec with BeforeAndAfter {
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala
similarity index 94%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala
index 94f65f82e11..6c989a0a0e2 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.pieChart
+package org.apache.texera.amber.operator.visualization.pieChart
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala
similarity index 95%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala
index 438a6ab3ea4..480d30512cb 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.operator.visualization.scatterplot
+package org.apache.texera.amber.operator.visualization.scatterplot
 
 import org.scalatest.BeforeAndAfter
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/util/ArrowUtilsSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/util/ArrowUtilsSpec.scala
similarity index 58%
rename from core/workflow-operator/src/test/scala/edu/uci/ics/amber/util/ArrowUtilsSpec.scala
rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/util/ArrowUtilsSpec.scala
index 27a15d89cc4..6a97df8ca3e 100644
--- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/util/ArrowUtilsSpec.scala
+++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/util/ArrowUtilsSpec.scala
@@ -17,17 +17,18 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.util
+package org.apache.texera.amber.util
 
-import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.AttributeTypeException
-import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, Tuple}
+import org.apache.texera.amber.core.tuple.AttributeTypeUtils.AttributeTypeException
+import org.apache.texera.amber.core.tuple.{AttributeType, LargeBinary, Schema, Tuple}
 import org.apache.arrow.memory.{BufferAllocator, RootAllocator}
 import org.apache.arrow.vector.VectorSchemaRoot
-import org.apache.arrow.vector.types.pojo.{ArrowType, Field}
+import org.apache.arrow.vector.types.pojo.{ArrowType, Field, FieldType}
 import org.apache.arrow.vector.types.{DateUnit, FloatingPointPrecision, IntervalUnit, TimeUnit}
 import org.scalatest.flatspec.AnyFlatSpec
 
 import java.sql.Timestamp
+import java.util
 import scala.jdk.CollectionConverters.IterableHasAsJava
 class ArrowUtilsSpec extends AnyFlatSpec {
 
@@ -99,6 +100,9 @@ class ArrowUtilsSpec extends AnyFlatSpec {
     // but not the other way around.
     assert(ArrowUtils.fromAttributeType(AttributeType.ANY) == string)
 
+    // LARGE_BINARY is converted to ArrowType.Utf8 (same as STRING)
+    assert(ArrowUtils.fromAttributeType(AttributeType.LARGE_BINARY) == string)
+
   }
 
   it should "raise AttributeTypeException when converting unsupported types" in {
@@ -239,4 +243,140 @@ class ArrowUtilsSpec extends AnyFlatSpec {
 
   }
 
+  it should "convert from AttributeType to ArrowType for LARGE_BINARY correctly" in {
+    // LARGE_BINARY is converted to ArrowType.Utf8 (stored as string)
+    assert(ArrowUtils.fromAttributeType(AttributeType.LARGE_BINARY) == string)
+  }
+
+  it should "convert Texera Schema with LARGE_BINARY to Arrow Schema with metadata correctly" in {
+    val texeraSchemaWithLargeBinary = Schema()
+      .add("regular_string", AttributeType.STRING)
+      .add("large_binary_field", AttributeType.LARGE_BINARY)
+
+    val arrowSchema = ArrowUtils.fromTexeraSchema(texeraSchemaWithLargeBinary)
+
+    // Check that regular string field has no metadata
+    val regularStringField = arrowSchema.getFields.get(0)
+    assert(regularStringField.getName == "regular_string")
+    assert(regularStringField.getType == string)
+    assert(
+      regularStringField.getMetadata == null || !regularStringField.getMetadata.containsKey(
+        "texera_type"
+      )
+    )
+
+    // Check that LARGE_BINARY field has metadata
+    val largeBinaryField = arrowSchema.getFields.get(1)
+    assert(largeBinaryField.getName == "large_binary_field")
+    assert(largeBinaryField.getType == string) // LARGE_BINARY is stored as Utf8
+    assert(largeBinaryField.getMetadata != null)
+    assert(largeBinaryField.getMetadata.get("texera_type") == "LARGE_BINARY")
+  }
+
+  it should "convert Arrow Schema with LARGE_BINARY metadata to Texera Schema correctly" in {
+    // Create Arrow schema with LARGE_BINARY metadata
+    val largeBinaryMetadata = new util.HashMap[String, String]()
+    largeBinaryMetadata.put("texera_type", "LARGE_BINARY")
+
+    val arrowSchemaWithLargeBinary = new org.apache.arrow.vector.types.pojo.Schema(
+      Array(
+        Field.nullablePrimitive("regular_string", string),
+        new Field(
+          "large_binary_field",
+          new FieldType(true, string, null, largeBinaryMetadata),
+          null
+        )
+      ).toList.asJava
+    )
+
+    val texeraSchema = ArrowUtils.toTexeraSchema(arrowSchemaWithLargeBinary)
+
+    assert(texeraSchema.getAttribute("regular_string").getName == "regular_string")
+    assert(texeraSchema.getAttribute("regular_string").getType == AttributeType.STRING)
+
+    assert(texeraSchema.getAttribute("large_binary_field").getName == "large_binary_field")
+    assert(texeraSchema.getAttribute("large_binary_field").getType == AttributeType.LARGE_BINARY)
+  }
+
+  it should "set and get Texera Tuple with LARGE_BINARY correctly" in {
+    val texeraSchemaWithLargeBinary = Schema()
+      .add("large_binary_field", AttributeType.LARGE_BINARY)
+      .add("regular_string", AttributeType.STRING)
+
+    val largeBinary = new LargeBinary("s3://test-bucket/path/to/object")
+    val tuple = Tuple
+      .builder(texeraSchemaWithLargeBinary)
+      .addSequentially(
+        Array(
+          largeBinary,
+          "regular string value"
+        )
+      )
+      .build()
+
+    val allocator: BufferAllocator = new RootAllocator()
+    val arrowSchema = ArrowUtils.fromTexeraSchema(texeraSchemaWithLargeBinary)
+    val vectorSchemaRoot = VectorSchemaRoot.create(arrowSchema, allocator)
+    vectorSchemaRoot.allocateNew()
+
+    // Set Tuple into the Vectors
+    ArrowUtils.appendTexeraTuple(tuple, vectorSchemaRoot)
+
+    // Verify the LARGE_BINARY is stored as string (URI) in Arrow
+    val storedValue = vectorSchemaRoot.getVector(0).getObject(0)
+    assert(storedValue.toString == "s3://test-bucket/path/to/object")
+
+    // Get the Tuple from the Vectors
+    val retrievedTuple = ArrowUtils.getTexeraTuple(0, vectorSchemaRoot)
+    assert(retrievedTuple.getField[LargeBinary](0) == largeBinary)
+    assert(retrievedTuple.getField[String](1) == "regular string value")
+  }
+
+  it should "handle null LARGE_BINARY values correctly" in {
+    val texeraSchemaWithLargeBinary = Schema()
+      .add("large_binary_field", AttributeType.LARGE_BINARY)
+
+    val tuple = Tuple
+      .builder(texeraSchemaWithLargeBinary)
+      .addSequentially(
+        Array(
+          null.asInstanceOf[LargeBinary]
+        )
+      )
+      .build()
+
+    val allocator: BufferAllocator = new RootAllocator()
+    val arrowSchema = ArrowUtils.fromTexeraSchema(texeraSchemaWithLargeBinary)
+    val vectorSchemaRoot = VectorSchemaRoot.create(arrowSchema, allocator)
+    vectorSchemaRoot.allocateNew()
+
+    // Set Tuple into the Vectors
+    ArrowUtils.appendTexeraTuple(tuple, vectorSchemaRoot)
+
+    // Verify null is stored correctly
+    assert(vectorSchemaRoot.getVector(0).getObject(0) == null)
+
+    // Get the Tuple from the Vectors
+    val retrievedTuple = ArrowUtils.getTexeraTuple(0, vectorSchemaRoot)
+    assert(retrievedTuple.getField[LargeBinary](0) == null)
+  }
+
+  it should "round-trip LARGE_BINARY schema conversion correctly" in {
+    val originalSchema = Schema()
+      .add("field1", AttributeType.STRING)
+      .add("field2", AttributeType.LARGE_BINARY)
+      .add("field3", AttributeType.INTEGER)
+      .add("field4", AttributeType.LARGE_BINARY)
+
+    // Convert to Arrow and back
+    val arrowSchema = ArrowUtils.fromTexeraSchema(originalSchema)
+    val roundTripSchema = ArrowUtils.toTexeraSchema(arrowSchema)
+
+    assert(roundTripSchema.getAttribute("field1").getType == AttributeType.STRING)
+    assert(roundTripSchema.getAttribute("field2").getType == AttributeType.LARGE_BINARY)
+    assert(roundTripSchema.getAttribute("field3").getType == AttributeType.INTEGER)
+    assert(roundTripSchema.getAttribute("field4").getType == AttributeType.LARGE_BINARY)
+    assert(roundTripSchema == originalSchema)
+  }
+
 }
diff --git a/core/computing-unit-managing-service/build.sbt b/computing-unit-managing-service/build.sbt
similarity index 98%
rename from core/computing-unit-managing-service/build.sbt
rename to computing-unit-managing-service/build.sbt
index 8c1a9db2c90..853e2304821 100644
--- a/core/computing-unit-managing-service/build.sbt
+++ b/computing-unit-managing-service/build.sbt
@@ -18,7 +18,7 @@
 import scala.collection.Seq
 
 name := "computing-unit-managing-service"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
diff --git a/core/computing-unit-managing-service/project/build.properties b/computing-unit-managing-service/project/build.properties
similarity index 100%
rename from core/computing-unit-managing-service/project/build.properties
rename to computing-unit-managing-service/project/build.properties
diff --git a/core/computing-unit-managing-service/project/plugins.sbt b/computing-unit-managing-service/project/plugins.sbt
similarity index 100%
rename from core/computing-unit-managing-service/project/plugins.sbt
rename to computing-unit-managing-service/project/plugins.sbt
diff --git a/core/computing-unit-managing-service/src/main/resources/computing-unit-managing-service-config.yaml b/computing-unit-managing-service/src/main/resources/computing-unit-managing-service-config.yaml
similarity index 100%
rename from core/computing-unit-managing-service/src/main/resources/computing-unit-managing-service-config.yaml
rename to computing-unit-managing-service/src/main/resources/computing-unit-managing-service-config.yaml
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/ComputingUnitManagingService.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala
similarity index 85%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/ComputingUnitManagingService.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala
index 0e3c49e3e79..1c0cf8768df 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/ComputingUnitManagingService.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala
@@ -17,21 +17,22 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.util.PathUtils.workflowComputingUnitManagingServicePath
-import edu.uci.ics.texera.auth.{JwtAuthFilter, SessionUser}
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.service.resource.{
-  ComputingUnitManagingResource,
-  HealthCheckResource,
-  ComputingUnitAccessResource
-}
 import io.dropwizard.auth.AuthDynamicFeature
-import io.dropwizard.core.setup.{Bootstrap, Environment}
 import io.dropwizard.core.Application
+import io.dropwizard.core.setup.{Bootstrap, Environment}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.service.resource.{
+  ComputingUnitAccessResource,
+  ComputingUnitManagingResource,
+  HealthCheckResource
+}
+
+import java.nio.file.Path
 
 class ComputingUnitManagingService extends Application[ComputingUnitManagingServiceConfiguration] {
 
@@ -68,8 +69,11 @@ class ComputingUnitManagingService extends Application[ComputingUnitManagingServ
 }
 
 object ComputingUnitManagingService {
+
   def main(args: Array[String]): Unit = {
-    val configFilePath = workflowComputingUnitManagingServicePath
+    val configFilePath = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("computing-unit-managing-service")
       .resolve("src")
       .resolve("main")
       .resolve("resources")
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/ComputingUnitManagingServiceConfiguration.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingServiceConfiguration.scala
similarity index 96%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/ComputingUnitManagingServiceConfiguration.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingServiceConfiguration.scala
index dfffaea8406..0513bdfa5fe 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/ComputingUnitManagingServiceConfiguration.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingServiceConfiguration.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import io.dropwizard.core.Configuration
 
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitAccessResource.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
similarity index 90%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitAccessResource.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
index c91e1d80f92..c5fdfa260dc 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitAccessResource.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
@@ -16,28 +16,28 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.service.resource
-
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.config.ComputingUnitConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+package org.apache.texera.service.resource
+
+import io.dropwizard.auth.Auth
+import jakarta.annotation.security.RolesAllowed
+import jakarta.ws.rs.core.MediaType
+import jakarta.ws.rs._
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.config.ComputingUnitConfig
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.Tables.COMPUTING_UNIT_USER_ACCESS
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   ComputingUnitUserAccessDao,
   UserDao,
   WorkflowComputingUnitDao
 }
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.ComputingUnitUserAccess
-import edu.uci.ics.texera.service.resource.ComputingUnitAccessResource._
-import edu.uci.ics.texera.dao.jooq.generated.Tables.COMPUTING_UNIT_USER_ACCESS
+import org.apache.texera.dao.jooq.generated.tables.pojos.ComputingUnitUserAccess
+import org.apache.texera.service.resource.ComputingUnitAccessResource._
+import org.jooq.{DSLContext, EnumType}
 
 import scala.jdk.CollectionConverters._
-import io.dropwizard.auth.Auth
-import jakarta.annotation.security.RolesAllowed
-import jakarta.ws.rs.core.MediaType
-import jakarta.ws.rs.{DELETE, ForbiddenException, GET, PUT, Path, PathParam, Produces}
-import org.jooq.{DSLContext, EnumType}
 
 object ComputingUnitAccessResource {
   private lazy val context: DSLContext = SqlServer
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitManagingResource.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
similarity index 96%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitManagingResource.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
index 1065a74a76a..f1fddcd4d9d 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitManagingResource.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
@@ -17,47 +17,45 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
-
-import edu.uci.ics.amber.config.{EnvironmentalVariable, StorageConfig}
-import edu.uci.ics.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims}
-import edu.uci.ics.texera.auth.{JwtAuth, SessionUser}
-import edu.uci.ics.texera.config.{ComputingUnitConfig, KubernetesConfig}
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
-  ComputingUnitUserAccessDao,
-  UserDao,
-  WorkflowComputingUnitDao
-}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowComputingUnit
-import edu.uci.ics.texera.dao.jooq.generated.enums.{PrivilegeEnum, WorkflowComputingUnitTypeEnum}
-import KubernetesConfig.{
+package org.apache.texera.service.resource
+
+import io.dropwizard.auth.Auth
+import io.fabric8.kubernetes.api.model.Quantity
+import io.fabric8.kubernetes.client.KubernetesClientException
+import jakarta.annotation.security.RolesAllowed
+import jakarta.ws.rs._
+import jakarta.ws.rs.core.{MediaType, Response}
+import org.apache.texera.amber.config.{EnvironmentalVariable, StorageConfig}
+import org.apache.commons.lang3.StringUtils
+import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims}
+import org.apache.texera.auth.{JwtAuth, SessionUser}
+import org.apache.texera.config.KubernetesConfig.{
   cpuLimitOptions,
   gpuLimitOptions,
   maxNumOfRunningComputingUnitsPerUser,
   memoryLimitOptions
 }
-import edu.uci.ics.texera.service.resource.ComputingUnitManagingResource._
-import edu.uci.ics.texera.service.resource.ComputingUnitState._
-import edu.uci.ics.texera.service.resource.ComputingUnitAccessResource
-import edu.uci.ics.texera.service.util.{
+import org.apache.texera.config.{ComputingUnitConfig, KubernetesConfig}
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.enums.{PrivilegeEnum, WorkflowComputingUnitTypeEnum}
+import org.apache.texera.dao.jooq.generated.tables.daos.{
+  ComputingUnitUserAccessDao,
+  UserDao,
+  WorkflowComputingUnitDao
+}
+import org.apache.texera.dao.jooq.generated.tables.pojos.WorkflowComputingUnit
+import org.apache.texera.service.resource.ComputingUnitManagingResource._
+import org.apache.texera.service.resource.ComputingUnitState._
+import org.apache.texera.service.util.{
   ComputingUnitManagingServiceException,
   InsufficientComputingUnitQuota,
   KubernetesClient
 }
-import io.dropwizard.auth.Auth
-import io.fabric8.kubernetes.api.model.Quantity
-import io.fabric8.kubernetes.client.KubernetesClientException
-import jakarta.annotation.security.RolesAllowed
-import jakarta.ws.rs._
-import jakarta.ws.rs.core.{MediaType, Response}
-import org.apache.commons.lang3.StringUtils
 import org.jooq.{DSLContext, EnumType}
-
-import java.sql.Timestamp
 import play.api.libs.json._
 
+import java.sql.Timestamp
 import scala.annotation.unused
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitState.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitState.scala
similarity index 95%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitState.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitState.scala
index 6f3f7d72996..e6ff217cfb5 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/resource/ComputingUnitState.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitState.scala
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
 object ComputingUnitState extends Enumeration {
   type ComputingUnitState = Value
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 96%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
index 895f6a400af..08ecd1cd0cb 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
 import jakarta.ws.rs.core.MediaType
 import jakarta.ws.rs.{GET, Path, Produces}
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/ComputingUnitHelpers.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/ComputingUnitHelpers.scala
similarity index 83%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/ComputingUnitHelpers.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/ComputingUnitHelpers.scala
index c35211cde6f..8ae31bba7fb 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/ComputingUnitHelpers.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/ComputingUnitHelpers.scala
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.texera.service.util
+package org.apache.texera.service.util
 
-import edu.uci.ics.texera.dao.jooq.generated.enums.WorkflowComputingUnitTypeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowComputingUnit
-import edu.uci.ics.texera.service.resource.ComputingUnitManagingResource.WorkflowComputingUnitMetrics
-import edu.uci.ics.texera.service.resource.ComputingUnitState.{ComputingUnitState, Pending, Running}
+import org.apache.texera.dao.jooq.generated.enums.WorkflowComputingUnitTypeEnum
+import org.apache.texera.dao.jooq.generated.tables.pojos.WorkflowComputingUnit
+import org.apache.texera.service.resource.ComputingUnitManagingResource.WorkflowComputingUnitMetrics
+import org.apache.texera.service.resource.ComputingUnitState.{ComputingUnitState, Pending, Running}
 
 object ComputingUnitHelpers {
   def getComputingUnitStatus(unit: WorkflowComputingUnit): ComputingUnitState = {
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/ComputingUnitManagingServiceException.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/ComputingUnitManagingServiceException.scala
similarity index 98%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/ComputingUnitManagingServiceException.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/ComputingUnitManagingServiceException.scala
index 812809f4255..22660113e99 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/ComputingUnitManagingServiceException.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/ComputingUnitManagingServiceException.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.util
+package org.apache.texera.service.util
 
 import io.fabric8.kubernetes.client.KubernetesClientException
 import jakarta.ws.rs.WebApplicationException
diff --git a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/KubernetesClient.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala
similarity index 98%
rename from core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/KubernetesClient.scala
rename to computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala
index 77cd30ecd0f..cfc01b83b64 100644
--- a/core/computing-unit-managing-service/src/main/scala/edu/uci/ics/texera/service/util/KubernetesClient.scala
+++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/util/KubernetesClient.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.util
+package org.apache.texera.service.util
 
-import edu.uci.ics.texera.config.KubernetesConfig
 import io.fabric8.kubernetes.api.model._
 import io.fabric8.kubernetes.api.model.metrics.v1beta1.PodMetricsList
 import io.fabric8.kubernetes.client.KubernetesClientBuilder
+import org.apache.texera.config.KubernetesConfig
 
 import scala.jdk.CollectionConverters._
 
diff --git a/core/config-service/build.sbt b/config-service/build.sbt
similarity index 99%
rename from core/config-service/build.sbt
rename to config-service/build.sbt
index 1ae9470569d..87872688c36 100644
--- a/core/config-service/build.sbt
+++ b/config-service/build.sbt
@@ -18,7 +18,7 @@
 import scala.collection.Seq
 
 name := "config-service"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
diff --git a/core/config-service/src/main/resources/config-service-web-config.yaml b/config-service/src/main/resources/config-service-web-config.yaml
similarity index 100%
rename from core/config-service/src/main/resources/config-service-web-config.yaml
rename to config-service/src/main/resources/config-service-web-config.yaml
diff --git a/core/config-service/src/main/scala/edu/uci/ics/texera/service/ConfigService.scala b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
similarity index 88%
rename from core/config-service/src/main/scala/edu/uci/ics/texera/service/ConfigService.scala
rename to config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
index 94d80ca50f0..c226eaf9c44 100644
--- a/core/config-service/src/main/scala/edu/uci/ics/texera/service/ConfigService.scala
+++ b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
@@ -17,22 +17,23 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
-import io.dropwizard.core.Application
-import io.dropwizard.core.setup.{Bootstrap, Environment}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.util.PathUtils.configServicePath
-import edu.uci.ics.texera.auth.{JwtAuthFilter, SessionUser}
-import edu.uci.ics.texera.config.DefaultsConfig
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.service.resource.{ConfigResource, HealthCheckResource}
 import io.dropwizard.auth.AuthDynamicFeature
+import io.dropwizard.core.Application
+import io.dropwizard.core.setup.{Bootstrap, Environment}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
+import org.apache.texera.config.DefaultsConfig
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.service.resource.{ConfigResource, HealthCheckResource}
 import org.eclipse.jetty.server.session.SessionHandler
 import org.jooq.impl.DSL
 
+import java.nio.file.Path
+
 class ConfigService extends Application[ConfigServiceConfiguration] with LazyLogging {
   override def initialize(bootstrap: Bootstrap[ConfigServiceConfiguration]): Unit = {
     // Register Scala module to Dropwizard default object mapper
@@ -98,7 +99,9 @@ class ConfigService extends Application[ConfigServiceConfiguration] with LazyLog
 
 object ConfigService {
   def main(args: Array[String]): Unit = {
-    val configFilePath = configServicePath
+    val configFilePath = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("config-service")
       .resolve("src")
       .resolve("main")
       .resolve("resources")
diff --git a/core/config-service/src/main/scala/edu/uci/ics/texera/service/ConfigServiceConfiguration.scala b/config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
similarity index 96%
rename from core/config-service/src/main/scala/edu/uci/ics/texera/service/ConfigServiceConfiguration.scala
rename to config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
index 6b339f4121a..cb58889d298 100644
--- a/core/config-service/src/main/scala/edu/uci/ics/texera/service/ConfigServiceConfiguration.scala
+++ b/config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import io.dropwizard.core.Configuration
 
diff --git a/core/config-service/src/main/scala/edu/uci/ics/texera/service/resource/ConfigResource.scala b/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
similarity index 90%
rename from core/config-service/src/main/scala/edu/uci/ics/texera/service/resource/ConfigResource.scala
rename to config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
index 3270e39af10..30c657746fb 100644
--- a/core/config-service/src/main/scala/edu/uci/ics/texera/service/resource/ConfigResource.scala
+++ b/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
-import edu.uci.ics.texera.config.{ComputingUnitConfig, GuiConfig, UserSystemConfig, AuthConfig}
 import jakarta.annotation.security.RolesAllowed
-import jakarta.ws.rs.{GET, Path, Produces}
 import jakarta.ws.rs.core.MediaType
+import jakarta.ws.rs.{GET, Path, Produces}
+import org.apache.texera.config.{AuthConfig, ComputingUnitConfig, GuiConfig, UserSystemConfig}
 
 @Path("/config")
 @Produces(Array(MediaType.APPLICATION_JSON))
@@ -55,6 +55,8 @@ class ConfigResource {
         "password" -> GuiConfig.guiLoginDefaultLocalUserPassword
       ),
       "activeTimeInMinutes" -> GuiConfig.guiWorkflowWorkspaceActiveTimeInMinutes,
+      "copilotEnabled" -> GuiConfig.guiWorkflowWorkspaceCopilotEnabled,
+      "limitColumns" -> GuiConfig.guiWorkflowWorkspaceLimitColumns,
       // flags from the auth.conf if needed
       "expirationTimeInMinutes" -> AuthConfig.jwtExpirationMinutes
     )
@@ -65,7 +67,6 @@ class ConfigResource {
   def getUserSystemConfig: Map[String, Any] =
     Map(
       // flags from the user-system.conf
-      "inviteOnly" -> UserSystemConfig.inviteOnly,
-      "userSystemEnabled" -> UserSystemConfig.isUserSystemEnabled
+      "inviteOnly" -> UserSystemConfig.inviteOnly
     )
 }
diff --git a/core/config-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala b/config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 96%
rename from core/config-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
rename to config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
index 895f6a400af..08ecd1cd0cb 100644
--- a/core/config-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
+++ b/config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
 import jakarta.ws.rs.core.MediaType
 import jakarta.ws.rs.{GET, Path, Produces}
diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala
deleted file mode 100644
index 8bca493850e..00000000000
--- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala
+++ /dev/null
@@ -1,132 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package edu.uci.ics.texera.service.resource
-
-import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.texera.auth.JwtParser.parseToken
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.auth.util.{ComputingUnitAccess, HeaderField}
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import jakarta.ws.rs.core._
-import jakarta.ws.rs.{GET, POST, Path, Produces}
-
-import java.util.Optional
-import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala}
-import scala.util.matching.Regex
-
-object AccessControlResource extends LazyLogging {
-
-  // Regex for the paths that require authorization
-  private val wsapiWorkflowWebsocket: Regex = """.*/wsapi/workflow-websocket.*""".r
-  private val apiExecutionsStats: Regex = """.*/api/executions/[0-9]+/stats/[0-9]+.*""".r
-  private val apiExecutionsResultExport: Regex = """.*/api/executions/result/export.*""".r
-
-  /**
-    * Authorize the request based on the path and headers.
-   * @param uriInfo URI sent by Envoy or API Gateway
-   * @param headers HTTP headers sent by Envoy or API Gateway which include
-   *                headers sent by the client (browser)
-   * @return HTTP Response with appropriate status code and headers
-   */
-  def authorize(uriInfo: UriInfo, headers: HttpHeaders): Response = {
-    val path = uriInfo.getPath
-    logger.info(s"Authorizing request for path: $path")
-
-    path match {
-      case wsapiWorkflowWebsocket() | apiExecutionsStats() | apiExecutionsResultExport() =>
-        checkComputingUnitAccess(uriInfo, headers)
-      case _ =>
-        logger.warn(s"No authorization logic for path: $path. Denying access.")
-        Response.status(Response.Status.FORBIDDEN).build()
-    }
-  }
-
-  private def checkComputingUnitAccess(uriInfo: UriInfo, headers: HttpHeaders): Response = {
-    val queryParams: Map[String, String] = uriInfo
-      .getQueryParameters()
-      .asScala
-      .view
-      .mapValues(values => values.asScala.headOption.getOrElse(""))
-      .toMap
-
-    logger.info(s"Request URI: ${uriInfo.getRequestUri} and headers: ${headers.getRequestHeaders.asScala} and queryParams: $queryParams")
-
-    val token = queryParams.getOrElse(
-      "access-token",
-      headers
-        .getRequestHeader("Authorization")
-        .asScala
-        .headOption
-        .getOrElse("")
-        .replace("Bearer ", "")
-    )
-    val cuid = queryParams.getOrElse("cuid", "")
-    val cuidInt = try {
-      cuid.toInt
-    } catch {
-      case _: NumberFormatException =>
-        return Response.status(Response.Status.FORBIDDEN).build()
-    }
-
-    var cuAccess: PrivilegeEnum = PrivilegeEnum.NONE
-    var userSession: Optional[SessionUser] = Optional.empty()
-    try {
-      userSession = parseToken(token)
-      if (userSession.isEmpty)
-        return Response.status(Response.Status.FORBIDDEN).build()
-
-      val uid = userSession.get().getUid
-      cuAccess = ComputingUnitAccess.getComputingUnitAccess(cuidInt, uid)
-      if (cuAccess == PrivilegeEnum.NONE)
-        return Response.status(Response.Status.FORBIDDEN).build()
-    } catch {
-      case e: Exception =>
-        return Response.status(Response.Status.FORBIDDEN).build()
-    }
-
-    Response
-      .ok()
-      .header(HeaderField.UserComputingUnitAccess, cuAccess.toString)
-      .header(HeaderField.UserId, userSession.get().getUid.toString)
-      .header(HeaderField.UserName, userSession.get().getName)
-      .header(HeaderField.UserEmail, userSession.get().getEmail)
-      .build()
-  }
-}
-@Produces(Array(MediaType.APPLICATION_JSON))
-@Path("/auth")
-class AccessControlResource extends LazyLogging {
-
-  @GET
-  @Path("/{path:.*}")
-  def authorizeGet(
-                    @Context uriInfo: UriInfo,
-                    @Context headers: HttpHeaders
-                  ): Response = {
-    AccessControlResource.authorize(uriInfo, headers)
-  }
-
-  @POST
-  @Path("/{path:.*}")
-  def authorizePost(
-                     @Context uriInfo: UriInfo,
-                     @Context headers: HttpHeaders
-                   ): Response = {
-    AccessControlResource.authorize(uriInfo, headers)
-  }
-}
diff --git a/core/amber/src/main/python/core/models/RTableExecutor.py b/core/amber/src/main/python/core/models/RTableExecutor.py
deleted file mode 100644
index 1eb8d92b4de..00000000000
--- a/core/amber/src/main/python/core/models/RTableExecutor.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import pyarrow as pa
-import rpy2.robjects as robjects
-from rpy2_arrow.arrow import rarrow_to_py_table, converter as arrow_converter
-from rpy2.robjects import default_converter
-from rpy2.robjects.conversion import localconverter as local_converter
-import typing
-from typing import Iterator, Optional, Union
-from core.models import ArrowTableTupleProvider, Tuple, TupleLike, Table, TableLike
-from core.models.operator import SourceOperator, TableOperator
-
-
-class RTableExecutor(TableOperator):
-    """
-    An executor that can execute R code on Arrow tables.
-    """
-
-    is_source = False
-
-    _arrow_to_r_dataframe = robjects.r(
-        "function(table) { return (as.data.frame(table)) }"
-    )
-
-    _r_dataframe_to_arrow = robjects.r(
-        """
-        library(arrow)
-        function(df) { return (arrow::as_arrow_table(df)) }
-        """
-    )
-
-    def __init__(self, r_code: str):
-        """
-        Initialize the RTableExecutor with R code.
-
-        Args:
-            r_code (str): R code to be executed.
-        """
-        super().__init__()
-        with local_converter(default_converter):
-            self._func: typing.Callable[[pa.Table], pa.Table] = robjects.r(r_code)
-
-    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:
-        """
-        Process an input Table using the provided R function.
-        The Table is represented as a pandas.DataFrame.
-
-        :param table: Table, a table to be processed.
-        :param port: int, input port index of the current Tuple.
-            Currently unused in R-UDF
-        :return: Iterator[Optional[TableLike]], producing one TableLike object at a
-        time, or None.
-        """
-        input_pyarrow_table = pa.Table.from_pandas(table)
-        with local_converter(arrow_converter):
-            input_r_dataframe = RTableExecutor._arrow_to_r_dataframe(
-                input_pyarrow_table
-            )
-            output_r_dataframe = self._func(input_r_dataframe, port)
-            output_rarrow_table = RTableExecutor._r_dataframe_to_arrow(
-                output_r_dataframe
-            )
-            output_pyarrow_table = rarrow_to_py_table(output_rarrow_table)
-
-        for field_accessor in ArrowTableTupleProvider(output_pyarrow_table):
-            yield Tuple(
-                {name: field_accessor for name in output_pyarrow_table.column_names}
-            )
-
-
-class RTableSourceExecutor(SourceOperator):
-    """
-    A source operator that produces an R Table or Table-like object using R code.
-    """
-
-    is_source = True
-    _source_output_to_arrow = robjects.r(
-        """
-    library(arrow)
-    function(source_output) {
-        return (arrow::as_arrow_table(as.data.frame(source_output)))
-    }
-    """
-    )
-
-    def __init__(self, r_code: str):
-        """
-        Initialize the RTableSourceExecutor with R code.
-
-        Args:
-            r_code (str): R code to be executed.
-        """
-        super().__init__()
-        # Use the local converter from rpy2 to load in the R function given by the user
-        with local_converter(default_converter):
-            self._func = robjects.r(r_code)
-
-    def produce(self) -> Iterator[Union[TupleLike, TableLike, None]]:
-        """
-        Produce Table using the provided R function.
-        Used by the source operator only.
-
-        :return: Iterator[Union[TupleLike, TableLike, None]], producing
-            one TupleLike object, one TableLike object, or None, at a time.
-        """
-        with local_converter(arrow_converter):
-            output_table = self._func()
-            output_rarrow_table = RTableSourceExecutor._source_output_to_arrow(
-                output_table
-            )
-            output_pyarrow_table = rarrow_to_py_table(output_rarrow_table)
-
-        for field_accessor in ArrowTableTupleProvider(output_pyarrow_table):
-            yield Tuple(
-                {name: field_accessor for name in output_pyarrow_table.column_names}
-            )
diff --git a/core/amber/src/main/python/core/models/RTupleExecutor.py b/core/amber/src/main/python/core/models/RTupleExecutor.py
deleted file mode 100644
index b098faffaa4..00000000000
--- a/core/amber/src/main/python/core/models/RTupleExecutor.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import pickle
-import datetime
-import pyarrow as pa
-import rpy2
-import rpy2.robjects as robjects
-from rpy2_arrow.arrow import converter as arrow_converter
-from rpy2.robjects import default_converter
-from rpy2.robjects.conversion import localconverter as local_converter
-from typing import Iterator, Optional, Union
-from core.models import Tuple, TupleLike, TableLike, r_utils
-from core.models.operator import SourceOperator, TupleOperatorV2
-import warnings
-
-warnings.filterwarnings(action="ignore", category=UserWarning, module=r"rpy2*")
-
-
-class RTupleExecutor(TupleOperatorV2):
-    """
-    An operator that can execute R code on R Lists (R's representation of a Tuple)
-    """
-
-    is_source = False
-
-    _combine_binary_and_non_binary_lists = robjects.r(
-        """
-        function(non_binary_list, binary_list) {
-            non_binary_list <- as.list(non_binary_list$as_vector())
-            return (c(non_binary_list, binary_list))
-        }
-        """
-    )
-
-    def __init__(self, r_code: str):
-        """
-        Initialize the RTupleExecutor with R code.
-
-        Args:
-            r_code (str): R code to be executed.
-        """
-        super().__init__()
-        # Use the local converter from rpy2 to load in the R function given by the user
-        with local_converter(default_converter):
-            self._func = robjects.r(r_code)
-
-    def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:
-        """
-        Process an input Tuple from the given link.
-
-        :param tuple_: Tuple, a Tuple from an input port to be processed.
-        :param port: int, input port index of the current Tuple.
-        :return: Iterator[Optional[TupleLike]], producing one TupleLike object at a
-            time, or None.
-        """
-        with local_converter(arrow_converter):
-            input_schema: pa.Schema = tuple_._schema.as_arrow_schema()
-            input_fields: list[str] = [field.name for field in input_schema]
-            non_binary_fields: list[str] = [
-                field.name for field in input_schema if field.type != pa.binary()
-            ]
-            binary_fields: list[str] = [
-                field.name for field in input_schema if field.type == pa.binary()
-            ]
-
-            non_binary_pyarrow_array: pa.StructArray = pa.array([], type=pa.struct([]))
-            if non_binary_fields:
-                non_binary_tuple: Tuple = tuple_.get_partial_tuple(non_binary_fields)
-                non_binary_tuple_schema: pa.Schema = (
-                    non_binary_tuple._schema.as_arrow_schema()
-                )
-                non_binary_pyarrow_array: pa.StructArray = pa.array(
-                    [non_binary_tuple.as_dict()],
-                    type=pa.struct(non_binary_tuple_schema),
-                )
-
-            binary_r_list: dict[str, object] = {}
-            if binary_fields:
-                binary_tuple: Tuple = tuple_.get_partial_tuple(binary_fields)
-                for k, v in binary_tuple.as_dict().items():
-                    if isinstance(v, bytes):
-                        binary_r_list[k] = pickle.loads(v[10:])
-                    elif isinstance(v, datetime.datetime):
-                        binary_r_list[k] = robjects.vectors.POSIXct.sexp_from_datetime(
-                            [v]
-                        )
-                    else:
-                        binary_r_list[k] = v
-
-            binary_r_list: rpy2.robjects.ListVector = robjects.vectors.ListVector(
-                binary_r_list
-            )
-
-            input_r_list: rpy2.robjects.ListVector = (
-                RTupleExecutor._combine_binary_and_non_binary_lists(
-                    non_binary_pyarrow_array, binary_r_list
-                )
-            )
-
-            output_r_generator: rpy2.robjects.SignatureTranslatedFunction = self._func(
-                input_r_list, port
-            )
-
-            while True:
-                output_py_tuple: Tuple = r_utils.extract_tuple_from_r(
-                    output_r_generator, False, input_fields
-                )
-                yield output_py_tuple if output_py_tuple is not None else None
-                if output_py_tuple is None:
-                    break
-
-
-class RTupleSourceExecutor(SourceOperator):
-    """
-    A source operator that produces a generator that yields R Lists using R code.
-    R Lists are R's representation of a Tuple
-    """
-
-    is_source = True
-
-    def __init__(self, r_code: str):
-        """
-        Initialize the RTupleSourceExecutor with R code.
-
-        Args:
-            r_code (str): R code to be executed.
-        """
-        super().__init__()
-        # Use the local converter from rpy2 to load in the R function given by the user
-        with local_converter(default_converter):
-            self._func = robjects.r(r_code)
-
-    def produce(self) -> Iterator[Union[TupleLike, TableLike, None]]:
-        """
-        Produce Tuples using the provided R generator returned by the UDF.
-        The returned R generator is an iterator
-        that yields R Lists (R's representation of Tuple)
-        Used by the source operator only.
-
-        :return: Iterator[Union[TupleLike, TableLike, None]], producing
-            one TupleLike object, one TableLike object, or None, at a time.
-        """
-        with local_converter(arrow_converter):
-            output_r_generator: rpy2.robjects.SignatureTranslatedFunction = self._func()
-            while True:
-                output_py_tuple: Tuple = r_utils.extract_tuple_from_r(
-                    output_r_generator, True
-                )
-                yield output_py_tuple if output_py_tuple is not None else None
-                if output_py_tuple is None:
-                    break
diff --git a/core/amber/src/main/python/core/models/r_utils.py b/core/amber/src/main/python/core/models/r_utils.py
deleted file mode 100644
index 94c900f7be8..00000000000
--- a/core/amber/src/main/python/core/models/r_utils.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import rpy2
-import rpy2.rinterface as rinterface
-import rpy2.robjects as robjects
-from core.models import Tuple
-import warnings
-
-warnings.filterwarnings(action="ignore", category=UserWarning, module=r"rpy2*")
-
-
-def convert_r_to_py(value: rpy2.robjects):
-    """
-    :param value: A value that is from one of rpy2's many types (from rpy2.robjects)
-    :return: A Python representation of the value, if convertable.
-        If not, it returns the value itself
-    """
-    if isinstance(value, robjects.vectors.BoolVector):
-        return bool(value[0])
-    if isinstance(value, robjects.vectors.IntVector):
-        return int(value[0])
-    if isinstance(value, robjects.vectors.FloatVector):
-        if isinstance(value, robjects.vectors.POSIXct):
-            return next(value.iter_localized_datetime())
-        else:
-            return float(value[0])
-    if isinstance(value, robjects.vectors.StrVector):
-        return str(value[0])
-    return value
-
-
-def extract_tuple_from_r(
-    output_r_generator: rpy2.robjects.SignatureTranslatedFunction,
-    source_operator: bool,
-    input_fields: [None, list[str]] = None,
-) -> [Tuple, None]:
-    output_r_tuple: rpy2.robjects.ListVector = output_r_generator()
-    if (
-        isinstance(output_r_tuple, rinterface.SexpSymbol)
-        and str(output_r_tuple) == ".__exhausted__."
-    ) or isinstance(output_r_tuple.names, rpy2.rinterface_lib.sexp.NULLType):
-        return None
-
-    output_python_dict: dict[str, object] = {}
-    if source_operator:
-        output_python_dict = {
-            key: output_r_tuple.rx2(key) for key in output_r_tuple.names
-        }
-    else:
-        diff_fields: list[str] = [
-            field_name
-            for field_name in output_r_tuple.names
-            if field_name not in input_fields
-        ]
-        output_python_dict: dict[str, object] = {
-            key: output_r_tuple.rx2(key) for key in (input_fields + diff_fields)
-        }
-
-    output_python_dict: dict[str, object] = {
-        key: convert_r_to_py(value) for key, value in output_python_dict.items()
-    }
-
-    return Tuple(output_python_dict)
diff --git a/core/amber/src/main/python/core/models/test_RTableExecutor.py b/core/amber/src/main/python/core/models/test_RTableExecutor.py
deleted file mode 100644
index 0760fd0bf13..00000000000
--- a/core/amber/src/main/python/core/models/test_RTableExecutor.py
+++ /dev/null
@@ -1,538 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import pandas
-import pytest
-import rpy2.rinterface_lib.embedded
-from core.models import Tuple, Table
-from core.models.RTableExecutor import RTableSourceExecutor, RTableExecutor
-
-
-class TestRTableExecutor:
-    @pytest.fixture
-    def source_executor_empty(self):
-        return """
-        function() {
-            df <- data.frame(
-                col1 = character(),
-                col2 = numeric(),
-                col3 = logical()
-                )
-            return (df)
-        }
-        """
-
-    @pytest.fixture
-    def source_executor_NA(self):
-        # This should work with no issues
-        # since you can store NA in a data.frame
-        # and then convert the data.frame to Arrow Table with
-        # one Tuple with value Tuple({"source_output": None})
-        return """
-        function() {
-            return (NA)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_return_NA(self):
-        # This should fail since the conversion back
-        # to Arrow will be impossible
-        return """
-        function(table, port) {
-            return (NA)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_simple_return(self):
-        return """
-        function(table, port) {
-            return (table)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_empty_add_row(self):
-        return """
-        function(table, port) {
-            new_row <- data.frame(
-                col1 = "TEST",
-                col2 = 12.3,
-                col3 = TRUE
-              )
-            table <- rbind(table, new_row)
-            return (table)
-        }
-        """
-
-    @pytest.fixture
-    def source_executor_null_values(self):
-        return """
-        function() {
-            df <- data.frame(
-                col1 = character(),
-                col2 = numeric(),
-                col3 = logical()
-                )
-            df[1:3,] <- NA
-            return (df)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_null_values_return(self):
-        return """
-        function(table, port) {
-            return (table)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_null_values_add_row(self):
-        return """
-        function(table, port) {
-            new_row <- data.frame(
-                col1 = NA,
-                col2 = NA,
-                col3 = NA
-              )
-            table <- rbind(table, new_row)
-            return (table)
-        }
-        """
-
-    @pytest.fixture
-    def target_tuples_null_values(self):
-        tuple_1 = Tuple({"col1": None, "col2": None, "col3": None})
-        tuple_2 = Tuple({"col1": None, "col2": None, "col3": None})
-        tuple_3 = Tuple({"col1": None, "col2": None, "col3": None})
-        return [tuple_1, tuple_2, tuple_3]
-
-    @pytest.fixture
-    def pandas_target_df_simple(self):
-        data = {
-            "Name": ["Alice", "Bob", "Charlie"],
-            "Age": [25, 30, 35],
-            "City": ["New York", "Los Angeles", "Chicago"],
-        }
-        df = pandas.DataFrame(data)
-        return df
-
-    @pytest.fixture
-    def target_tuples_simple(self, pandas_target_df_simple):
-        tuples = []
-        for index, row in pandas_target_df_simple.iterrows():
-            tuples.append(Tuple(row))
-        return tuples
-
-    @pytest.fixture
-    def source_executor_simple(self):
-        return """
-        function() {
-            df <- data.frame(
-              Name = c("Alice", "Bob", "Charlie"),
-              Age = c(25, 30, 35),
-              City = c("New York", "Los Angeles", "Chicago")
-              )
-            return (df)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_simple_extract_row(self):
-        return """
-        function(table, port) {
-            bob_row <- table[table$Name == "Bob", ]
-            return (bob_row)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_simple_update_row(self):
-        return """
-        function(table, port) {
-            table[table$Name == "Bob", "Age"] <- 18
-            return (table)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_simple_add_row(self):
-        return """
-        function(table, port) {
-            new_row <- list(Name = "Test", Age = 0, City = "Irvine")
-            new_df <- rbind(table, new_row)
-            return (new_df)
-        }
-        """
-
-    @pytest.fixture
-    def source_executor_df_fail(self):
-        # This Source UDF should raise a TypeError since it cannot
-        # be converted into a Table-like object
-        return """
-        function() {
-            glm_model <- glm(mpg ~ wt, data = mtcars, family = gaussian)
-            return (glm_model)
-        }
-        """
-
-    @pytest.fixture
-    def target_tuples_like_type(self):
-        tuple_1 = Tuple({"C.1": 1, "C.2": 2, "C.3": 3})
-        tuple_2 = Tuple({"C.1": 11, "C.2": 12, "C.3": 13})
-        return [tuple_1, tuple_2]
-
-    @pytest.fixture
-    def source_executor_df_like_type(self):
-        return """
-        function() {
-            mdat <- matrix(c(1,2,3, 11,12,13), nrow = 2, ncol = 3, byrow = TRUE,
-                dimnames = list(c("row1", "row2"),
-                c("C.1", "C.2", "C.3")))
-            return (mdat)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_df_like_type_add_row(self):
-        return """
-        function(table, port) {
-            # Adding a new row
-            new_row <- c(4, 5, 6)
-            table <- rbind(table, new_row)
-
-            return (table)
-        }
-        """
-
-    @pytest.fixture
-    def udf_executor_df_like_type_add_col(self):
-        return """
-        function(table, port) {
-            # Adding a new col
-            new_col <- c("AAA", "BBB")
-            table <- cbind(table, new_col)
-
-            return (table)
-        }
-        """
-
-    def test_source_executor_empty(self, source_executor_empty):
-        source_executor = RTableSourceExecutor(source_executor_empty)
-        output = source_executor.produce()
-        tuples = [tup for tup in output]
-        assert len(tuples) == 0
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table([])
-
-    def test_source_executor_NA(self, source_executor_NA):
-        source_executor = RTableSourceExecutor(source_executor_NA)
-        output = source_executor.produce()
-        tuples = [tup for tup in output]
-        assert len(tuples) == 1
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table([Tuple({"source_output": None})])
-
-    def test_udf_executor_return_NA_fail(
-        self, source_executor_empty, udf_executor_return_NA
-    ):
-        source_executor = RTableSourceExecutor(source_executor_empty)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        with pytest.raises(rpy2.rinterface_lib.embedded.RRuntimeError) as _:
-            udf_executor = RTableExecutor(udf_executor_return_NA)
-            output = udf_executor.process_table(input_tbl, 0)
-            tuples = [out for out in output]
-            assert tuples is None
-
-    def test_udf_executor_empty_return(
-        self, source_executor_empty, udf_executor_simple_return
-    ):
-        source_executor = RTableSourceExecutor(source_executor_empty)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_simple_return)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        assert len(tuples) == 0
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table([])
-        assert output_tbl == input_tbl
-
-    def test_udf_executor_empty_add_row(
-        self, source_executor_empty, udf_executor_empty_add_row
-    ):
-        source_executor = RTableSourceExecutor(source_executor_empty)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_empty_add_row)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuple = Tuple({"col1": "TEST", "col2": 12.3, "col3": True})
-        assert len(tuples) == 1
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table([target_tuple])
-
-    def test_source_executor_null_values(
-        self, source_executor_null_values, target_tuples_null_values
-    ):
-        source_executor = RTableSourceExecutor(source_executor_null_values)
-        output = source_executor.produce()
-        tuples = [tup for tup in output]
-        assert len(tuples) == 3
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_null_values)
-
-    def test_udf_executor_null_values_return(
-        self,
-        source_executor_null_values,
-        udf_executor_null_values_return,
-        target_tuples_null_values,
-    ):
-        source_executor = RTableSourceExecutor(source_executor_null_values)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_null_values_return)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        assert len(tuples) == 3
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_null_values)
-
-    def test_udf_executor_null_values_add_row(
-        self,
-        source_executor_null_values,
-        udf_executor_null_values_add_row,
-        target_tuples_null_values,
-    ):
-        source_executor = RTableSourceExecutor(source_executor_null_values)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_null_values_add_row)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuple = Tuple({"col1": None, "col2": None, "col3": None})
-        assert len(tuples) == 4
-        assert tuples[3] == target_tuple
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_null_values + [target_tuple])
-
-    def test_source_executor_simple(self, source_executor_simple, target_tuples_simple):
-        source_executor = RTableSourceExecutor(source_executor_simple)
-        output = source_executor.produce()
-
-        tuples = [tup for tup in output]
-        assert len(tuples) == 3
-
-        for idx, v in enumerate(tuples):
-            assert v == target_tuples_simple[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_simple)
-
-    def test_udf_executor_simple(
-        self, source_executor_simple, udf_executor_simple_return, target_tuples_simple
-    ):
-        source_executor = RTableSourceExecutor(source_executor_simple)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_simple_return)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        assert len(tuples) == 3
-
-        for idx, v in enumerate(tuples):
-            assert v == target_tuples_simple[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_simple)
-        assert output_tbl == input_tbl
-
-    def test_udf_executor_simple_extract_row(
-        self,
-        source_executor_simple,
-        udf_executor_simple_extract_row,
-        target_tuples_simple,
-    ):
-        source_executor = RTableSourceExecutor(source_executor_simple)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_simple_extract_row)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuple = Tuple({"Name": "Bob", "Age": 30, "City": "Los Angeles"})
-        assert len(tuples) == 1
-        assert tuples[0] == target_tuple
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table([target_tuple])
-
-    def test_udf_executor_simple_update_row(
-        self,
-        source_executor_simple,
-        udf_executor_simple_update_row,
-        target_tuples_simple,
-    ):
-        source_executor = RTableSourceExecutor(source_executor_simple)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_simple_update_row)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuple = Tuple({"Name": "Bob", "Age": 18, "City": "Los Angeles"})
-        assert len(tuples) == 3
-
-        for idx, v in enumerate(tuples):
-            if idx == 1:
-                assert v == target_tuple
-            else:
-                assert v == target_tuples_simple[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(
-            [target_tuples_simple[0], target_tuple, target_tuples_simple[2]]
-        )
-
-    def test_udf_executor_simple_add_row(
-        self, source_executor_simple, udf_executor_simple_add_row, target_tuples_simple
-    ):
-        source_executor = RTableSourceExecutor(source_executor_simple)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_simple_add_row)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuple = Tuple({"Name": "Test", "Age": 0, "City": "Irvine"})
-        assert len(tuples) == 4
-
-        for idx, v in enumerate(tuples):
-            if idx == len(tuples) - 1:
-                assert v == target_tuple
-            else:
-                assert v == target_tuples_simple[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(
-            [tup for tup in target_tuples_simple] + [target_tuple]
-        )
-
-    def test_source_executor_fail(self, source_executor_df_fail):
-        source_executor = RTableSourceExecutor(source_executor_df_fail)
-        with pytest.raises(rpy2.rinterface_lib.embedded.RRuntimeError) as _:
-            output = source_executor.produce()
-            output = [out for out in output]
-
-    def test_source_executor_df_like_type(
-        self, source_executor_df_like_type, target_tuples_like_type
-    ):
-        source_executor = RTableSourceExecutor(source_executor_df_like_type)
-        output = source_executor.produce()
-
-        tuples = [tup for tup in output]
-        assert len(tuples) == 2
-
-        for idx, v in enumerate(tuples):
-            assert v == target_tuples_like_type[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_like_type)
-
-    def test_udf_executor_df_like_type(
-        self,
-        source_executor_df_like_type,
-        udf_executor_simple_return,
-        target_tuples_like_type,
-    ):
-        source_executor = RTableSourceExecutor(source_executor_df_like_type)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_simple_return)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        assert len(tuples) == 2
-
-        for idx, v in enumerate(tuples):
-            assert v == target_tuples_like_type[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_like_type)
-        assert output_tbl == input_tbl
-
-    def test_udf_executor_df_like_type_add_row(
-        self,
-        source_executor_df_like_type,
-        udf_executor_df_like_type_add_row,
-        target_tuples_like_type,
-    ):
-        source_executor = RTableSourceExecutor(source_executor_df_like_type)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_df_like_type_add_row)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuple = Tuple({"C.1": 4, "C.2": 5, "C.3": 6})
-        assert len(tuples) == 3
-
-        for idx, v in enumerate(tuples):
-            if idx == len(tuples) - 1:
-                assert v == target_tuple
-            else:
-                assert v == target_tuples_like_type[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples_like_type + [target_tuple])
-
-    def test_udf_executor_df_like_type_add_col(
-        self, source_executor_df_like_type, udf_executor_df_like_type_add_col
-    ):
-        source_executor = RTableSourceExecutor(source_executor_df_like_type)
-        input_tbl = Table([tup for tup in source_executor.produce()])
-
-        udf_executor = RTableExecutor(udf_executor_df_like_type_add_col)
-        output = udf_executor.process_table(input_tbl, 0)
-
-        tuples = [tup for tup in output]
-        target_tuples = [
-            Tuple({"C.1": 1, "C.2": 2, "C.3": 3, "new_col": "AAA"}),
-            Tuple({"C.1": 11, "C.2": 12, "C.3": 13, "new_col": "BBB"}),
-        ]
-
-        assert len(tuples) == 2
-        for idx, v in enumerate(tuples):
-            assert v == target_tuples[idx]
-
-        output_tbl = Table(tuples)
-        assert output_tbl == Table(target_tuples)
diff --git a/core/amber/src/main/python/proto/edu/__init__.py b/core/amber/src/main/python/proto/edu/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/proto/edu/uci/__init__.py b/core/amber/src/main/python/proto/edu/uci/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/uci/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/__init__.py b/core/amber/src/main/python/proto/edu/uci/ics/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/uci/ics/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/__init__.py b/core/amber/src/main/python/proto/edu/uci/ics/amber/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/__init__.py b/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/__init__.py b/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/uci/ics/amber/engine/architecture/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/proto/edu/uci/ics/texera/__init__.py b/core/amber/src/main/python/proto/edu/uci/ics/texera/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/proto/edu/uci/ics/texera/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/python/pytexera/udf/__init__.py b/core/amber/src/main/python/pytexera/udf/__init__.py
deleted file mode 100644
index 13a83393a91..00000000000
--- a/core/amber/src/main/python/pytexera/udf/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala
deleted file mode 100644
index 0df84812aa5..00000000000
--- a/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package edu.uci.ics.texera.web
-
-import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.texera.auth.JwtAuth.jwtConsumer
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
-import org.apache.http.client.utils.URLEncodedUtils
-
-import java.net.URI
-import java.nio.charset.Charset
-import javax.websocket.HandshakeResponse
-import javax.websocket.server.{HandshakeRequest, ServerEndpointConfig}
-import scala.jdk.CollectionConverters.ListHasAsScala
-
-/**
-  * This configurator extracts HTTPSession and associates it to ServerEndpointConfig,
-  * allow it to be accessed by Websocket connections.
-  * <pre>
-  * See <a href="https://stackoverflow.com/questions/17936440/accessing-httpsession-
-  * from-httpservletrequest-in-a-web-socket-serverendpoint"></a>
-  * </pre>
-  */
-class ServletAwareConfigurator extends ServerEndpointConfig.Configurator with LazyLogging {
-
-  override def modifyHandshake(
-      config: ServerEndpointConfig,
-      request: HandshakeRequest,
-      response: HandshakeResponse
-  ): Unit = {
-    try {
-      val params =
-        URLEncodedUtils.parse(new URI("?" + request.getQueryString), Charset.defaultCharset())
-      params.asScala
-        .map(pair => pair.getName -> pair.getValue)
-        .toMap
-        .get("access-token")
-        .map(token => {
-          val claims = jwtConsumer.process(token).getJwtClaims
-          config.getUserProperties.put(
-            classOf[User].getName,
-            new User(
-              claims.getClaimValue("userId").asInstanceOf[Long].toInt,
-              claims.getSubject,
-              String.valueOf(claims.getClaimValue("email").asInstanceOf[String]),
-              null,
-              null,
-              null,
-              null,
-              null,
-              null
-            )
-          )
-        })
-
-    } catch {
-      case e: Exception =>
-        logger.error("Failed to retrieve the User during websocket handshake", e)
-    }
-
-  }
-}
diff --git a/core/config/src/main/scala/edu/uci/ics/amber/util/PathUtils.scala b/core/config/src/main/scala/edu/uci/ics/amber/util/PathUtils.scala
deleted file mode 100644
index 827bd5e289d..00000000000
--- a/core/config/src/main/scala/edu/uci/ics/amber/util/PathUtils.scala
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package edu.uci.ics.amber.util
-
-import java.nio.file.{Files, Path, Paths}
-import scala.jdk.CollectionConverters.IteratorHasAsScala
-
-object PathUtils {
-  val coreDirectoryName = "core"
-
-  /**
-    * Gets the real path of the workflow-compiling-service home directory by:
-    * 1) Checking if the current directory is workflow-compiling-service.
-    * If it's not, then:
-    * 2) Searching the siblings and children to find the home path.
-    *
-    * @return the real absolute path to the home directory
-    */
-  lazy val corePath: Path = {
-    val currentWorkingDirectory = Paths.get(".").toRealPath()
-    // check if the current directory is the home path
-    if (isCorePath(currentWorkingDirectory)) {
-      currentWorkingDirectory
-    } else {
-      // from current path's parent directory, search its children to find home path
-      val searchChildren = Files
-        .walk(currentWorkingDirectory.getParent, 3)
-        .filter((path: Path) => isCorePath(path))
-        .findAny
-      if (searchChildren.isPresent) {
-        searchChildren.get
-      } else {
-        throw new RuntimeException(
-          f"Finding $coreDirectoryName home path failed. Current working directory is " + currentWorkingDirectory
-        )
-      }
-    }
-  }
-
-  lazy val workflowCompilingServicePath: Path = corePath.resolve("workflow-compiling-service")
-
-  lazy val fileServicePath: Path = corePath.resolve("file-service")
-
-  lazy val workflowComputingUnitManagingServicePath: Path =
-    corePath.resolve("computing-unit-managing-service")
-
-  lazy val configServicePath: Path = corePath.resolve("config-service")
-
-  lazy val accessControlServicePath: Path = corePath.resolve("access-control-service")
-
-  private lazy val datasetsRootPath =
-    corePath.resolve("amber").resolve("user-resources").resolve("datasets")
-
-  def getDatasetPath(did: Integer): Path = {
-    datasetsRootPath.resolve(did.toString)
-  }
-
-  lazy val gitDirectoryPath: Path = corePath.getParent
-
-  def getAllDatasetDirectories(): List[Path] = {
-    if (Files.exists(datasetsRootPath)) {
-      Files
-        .list(datasetsRootPath)
-        .filter(Files.isDirectory(_))
-        .iterator()
-        .asScala
-        .toList
-    } else {
-      List.empty[Path]
-    }
-  }
-
-  private def isCorePath(path: Path): Boolean = {
-    path.toRealPath().endsWith(coreDirectoryName)
-  }
-}
diff --git a/core/dao/.gitignore b/core/dao/.gitignore
deleted file mode 100644
index 7d64c7f44c9..00000000000
--- a/core/dao/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/main/scala/edu/uci/ics/texera/dao/jooq/
\ No newline at end of file
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/util/S3StorageClient.scala b/core/file-service/src/main/scala/edu/uci/ics/texera/service/util/S3StorageClient.scala
deleted file mode 100644
index 2b1afd1165b..00000000000
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/util/S3StorageClient.scala
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package edu.uci.ics.texera.service.util
-
-import edu.uci.ics.amber.config.StorageConfig
-import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider}
-import software.amazon.awssdk.regions.Region
-import software.amazon.awssdk.services.s3.{S3Client, S3Configuration}
-import software.amazon.awssdk.services.s3.model._
-
-import java.security.MessageDigest
-import scala.jdk.CollectionConverters._
-
-/**
-  * S3Storage provides an abstraction for S3-compatible storage (e.g., MinIO).
-  * - Uses credentials and endpoint from StorageConfig.
-  * - Supports object upload, download, listing, and deletion.
-  */
-object S3StorageClient {
-  val MINIMUM_NUM_OF_MULTIPART_S3_PART: Long = 5L * 1024 * 1024 // 5 MiB
-  val MAXIMUM_NUM_OF_MULTIPART_S3_PARTS = 10_000
-
-  // Initialize MinIO-compatible S3 Client
-  private lazy val s3Client: S3Client = {
-    val credentials = AwsBasicCredentials.create(StorageConfig.s3Username, StorageConfig.s3Password)
-    S3Client
-      .builder()
-      .credentialsProvider(StaticCredentialsProvider.create(credentials))
-      .region(Region.of(StorageConfig.s3Region))
-      .endpointOverride(java.net.URI.create(StorageConfig.s3Endpoint)) // MinIO URL
-      .serviceConfiguration(
-        S3Configuration.builder().pathStyleAccessEnabled(true).build()
-      )
-      .build()
-  }
-
-  /**
-    * Checks if a directory (prefix) exists within an S3 bucket.
-    *
-    * @param bucketName The bucket name.
-    * @param directoryPrefix The directory (prefix) to check (must end with `/`).
-    * @return True if the directory contains at least one object, False otherwise.
-    */
-  def directoryExists(bucketName: String, directoryPrefix: String): Boolean = {
-    // Ensure the prefix ends with `/` to correctly match directories
-    val normalizedPrefix =
-      if (directoryPrefix.endsWith("/")) directoryPrefix else directoryPrefix + "/"
-
-    val listRequest = ListObjectsV2Request
-      .builder()
-      .bucket(bucketName)
-      .prefix(normalizedPrefix)
-      .maxKeys(1) // Only check if at least one object exists
-      .build()
-
-    val listResponse = s3Client.listObjectsV2(listRequest)
-    !listResponse.contents().isEmpty // If contents exist, directory exists
-  }
-
-  /**
-    * Creates an S3 bucket if it does not already exist.
-    *
-    * @param bucketName The name of the bucket to create.
-    */
-  def createBucketIfNotExist(bucketName: String): Unit = {
-    try {
-      // Check if the bucket already exists
-      s3Client.headBucket(HeadBucketRequest.builder().bucket(bucketName).build())
-    } catch {
-      case _: NoSuchBucketException | _: S3Exception =>
-        // If the bucket does not exist, create it
-        val createBucketRequest = CreateBucketRequest.builder().bucket(bucketName).build()
-        s3Client.createBucket(createBucketRequest)
-        println(s"Bucket '$bucketName' created successfully.")
-    }
-  }
-
-  /**
-    * Deletes a directory (all objects under a given prefix) from a bucket.
-    *
-    * @param bucketName Target S3/MinIO bucket.
-    * @param directoryPrefix The directory to delete (must end with `/`).
-    */
-  def deleteDirectory(bucketName: String, directoryPrefix: String): Unit = {
-    // Ensure the directory prefix ends with `/` to avoid accidental deletions
-    val prefix = if (directoryPrefix.endsWith("/")) directoryPrefix else directoryPrefix + "/"
-
-    // List objects under the given prefix
-    val listRequest = ListObjectsV2Request
-      .builder()
-      .bucket(bucketName)
-      .prefix(prefix)
-      .build()
-
-    val listResponse = s3Client.listObjectsV2(listRequest)
-
-    // Extract object keys
-    val objectKeys = listResponse.contents().asScala.map(_.key())
-
-    if (objectKeys.nonEmpty) {
-      val objectsToDelete =
-        objectKeys.map(key => ObjectIdentifier.builder().key(key).build()).asJava
-
-      val deleteRequest = Delete
-        .builder()
-        .objects(objectsToDelete)
-        .build()
-
-      // Compute MD5 checksum for MinIO if required
-      val md5Hash = MessageDigest
-        .getInstance("MD5")
-        .digest(deleteRequest.toString.getBytes("UTF-8"))
-
-      // Convert object keys to S3 DeleteObjectsRequest format
-      val deleteObjectsRequest = DeleteObjectsRequest
-        .builder()
-        .bucket(bucketName)
-        .delete(deleteRequest)
-        .build()
-
-      // Perform batch deletion
-      s3Client.deleteObjects(deleteObjectsRequest)
-    }
-  }
-}
diff --git a/core/file-service/src/test/scala/edu/uci/ics/texera/service/resource/DatasetResourceSpec.scala b/core/file-service/src/test/scala/edu/uci/ics/texera/service/resource/DatasetResourceSpec.scala
deleted file mode 100644
index 1a41488ebfd..00000000000
--- a/core/file-service/src/test/scala/edu/uci/ics/texera/service/resource/DatasetResourceSpec.scala
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package edu.uci.ics.texera.service.resource
-
-import edu.uci.ics.amber.core.storage.util.LakeFSStorageClient
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.MockTexeraDB
-import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{DatasetDao, UserDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{Dataset, User}
-import edu.uci.ics.texera.service.MockLakeFS
-import jakarta.ws.rs.{BadRequestException, ForbiddenException}
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.matchers.should.Matchers
-
-class DatasetResourceSpec
-    extends AnyFlatSpec
-    with Matchers
-    with MockTexeraDB
-    with MockLakeFS
-    with BeforeAndAfterAll {
-
-  private val testUser: User = {
-    val user = new User
-    user.setName("test_user")
-    user.setPassword("123")
-    user.setEmail("test_user@test.com")
-    user.setRole(UserRoleEnum.ADMIN)
-    user
-  }
-
-  private val testUser2: User = {
-    val user = new User
-    user.setName("test_user2")
-    user.setPassword("123")
-    user.setEmail("test_user2@test.com")
-    user.setRole(UserRoleEnum.ADMIN)
-    user
-  }
-
-  private val testDataset: Dataset = {
-    val dataset = new Dataset
-    dataset.setName("test-dataset")
-    dataset.setRepositoryName("test-dataset")
-    dataset.setIsPublic(true)
-    dataset.setIsDownloadable(true)
-    dataset.setDescription("dataset for test")
-    dataset
-  }
-
-  lazy val datasetDao = new DatasetDao(getDSLContext.configuration())
-
-  lazy val datasetResource = new DatasetResource()
-
-  lazy val sessionUser = new SessionUser(testUser)
-  lazy val sessionUser2 = new SessionUser(testUser2)
-
-  override protected def beforeAll(): Unit = {
-    super.beforeAll()
-
-    // init db
-    initializeDBAndReplaceDSLContext()
-
-    // insert test user
-    val userDao = new UserDao(getDSLContext.configuration())
-    userDao.insert(testUser)
-    userDao.insert(testUser2)
-
-    // insert test dataset
-    testDataset.setOwnerUid(testUser.getUid)
-    datasetDao.insert(testDataset)
-  }
-
-  "createDataset" should "create dataset successfully if user does not have a dataset with the same name" in {
-    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
-      datasetName = "new-dataset",
-      datasetDescription = "description for new dataset",
-      isDatasetPublic = false,
-      isDatasetDownloadable = true
-    )
-
-    val createdDataset = datasetResource.createDataset(createDatasetRequest, sessionUser)
-    createdDataset.dataset.getName shouldEqual "new-dataset"
-    createdDataset.dataset.getDescription shouldEqual "description for new dataset"
-    createdDataset.dataset.getIsPublic shouldBe false
-    createdDataset.dataset.getIsDownloadable shouldBe true
-  }
-
-  it should "refuse to create dataset if user already has a dataset with the same name" in {
-    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
-      datasetName = "test-dataset",
-      datasetDescription = "description for new dataset",
-      isDatasetPublic = false,
-      isDatasetDownloadable = true
-    )
-
-    assertThrows[BadRequestException] {
-      datasetResource.createDataset(createDatasetRequest, sessionUser)
-    }
-  }
-
-  it should "create dataset successfully if another user has a dataset with the same name" in {
-    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
-      datasetName = "test-dataset",
-      datasetDescription = "description for new dataset",
-      isDatasetPublic = false,
-      isDatasetDownloadable = true
-    )
-
-    val createdDataset = datasetResource.createDataset(createDatasetRequest, sessionUser2)
-    createdDataset.dataset.getName shouldEqual "test-dataset"
-    createdDataset.dataset.getDescription shouldEqual "description for new dataset"
-    createdDataset.dataset.getIsPublic shouldBe false
-    createdDataset.dataset.getIsDownloadable shouldBe true
-  }
-
-  it should "delete dataset successfully if user owns it" in {
-    // insert a dataset directly into DB
-    val dataset = new Dataset
-    dataset.setName("delete-ds")
-    dataset.setRepositoryName("delete-ds")
-    dataset.setDescription("for delete test")
-    dataset.setOwnerUid(testUser.getUid)
-    dataset.setIsPublic(true)
-    dataset.setIsDownloadable(true)
-    datasetDao.insert(dataset)
-
-    // create repo in LakeFS to match dataset
-    LakeFSStorageClient.initRepo(dataset.getRepositoryName)
-
-    // delete via DatasetResource
-    val response = datasetResource.deleteDataset(dataset.getDid, sessionUser)
-
-    // assert: response OK and DB no longer contains dataset
-    response.getStatus shouldEqual 200
-    datasetDao.fetchOneByDid(dataset.getDid) shouldBe null
-  }
-
-  it should "refuse to delete dataset if not owned by user" in {
-    // insert a dataset directly into DB
-    val dataset = new Dataset
-    dataset.setName("user1-ds")
-    dataset.setRepositoryName("user1-ds")
-    dataset.setDescription("for forbidden test")
-    dataset.setOwnerUid(testUser.getUid)
-    dataset.setIsPublic(true)
-    dataset.setIsDownloadable(true)
-    datasetDao.insert(dataset)
-
-    // create repo in LakeFS to match dataset
-    LakeFSStorageClient.initRepo(dataset.getRepositoryName)
-
-    // user2 tries to delete, should throw ForbiddenException
-    assertThrows[ForbiddenException] {
-      datasetResource.deleteDataset(dataset.getDid, sessionUser2)
-    }
-
-    // dataset still exists in DB
-    datasetDao.fetchOneByDid(dataset.getDid) should not be null
-  }
-
-  override protected def afterAll(): Unit = {
-    shutdownDB()
-  }
-}
diff --git a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.html b/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.html
deleted file mode 100644
index 756e5f54112..00000000000
--- a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<div class="centered-container">
-  <div class="input-wrapper">
-    <form nz-form>
-      <nz-row *ngIf="exportType !== 'data'">
-        <nz-col [nzSpan]="24">
-          <nz-form-item>
-            <nz-form-label nzFor="exportTypeInput">Export Type</nz-form-label>
-            <nz-form-control>
-              <nz-select
-                id="exportTypeInput"
-                [(ngModel)]="exportType"
-                name="exportType"
-                nzPlaceHolder="Select export type">
-                <nz-option
-                  *ngIf="isTableOutput"
-                  nzValue="arrow"
-                  nzLabel="Binary Format (.arrow)"></nz-option>
-                <nz-option
-                  *ngIf="isTableOutput && !containsBinaryData"
-                  nzValue="csv"
-                  nzLabel="Comma Separated Values (.csv)"></nz-option>
-                <nz-option
-                  *ngIf="isVisualizationOutput"
-                  nzValue="html"
-                  nzLabel="Web Page (.html)"></nz-option>
-                <nz-option
-                  nzValue="parquet"
-                  nzLabel="Parquet (.parquet)"></nz-option>
-              </nz-select>
-            </nz-form-control>
-          </nz-form-item>
-        </nz-col>
-      </nz-row>
-      <nz-row *ngIf="exportType === 'data'">
-        <nz-col [nzSpan]="24">
-          <nz-form-item>
-            <nz-form-label nzFor="filenameInput">Filename</nz-form-label>
-            <nz-form-control>
-              <input
-                id="filenameInput"
-                [(ngModel)]="inputFileName"
-                name="filename"
-                type="text"
-                nz-input
-                placeholder="Enter filename for binary data" />
-            </nz-form-control>
-          </nz-form-item>
-        </nz-col>
-      </nz-row>
-      <nz-row>
-        <nz-col [nzSpan]="24">
-          <nz-form-item>
-            <nz-form-label nzFor="destinationInput">Destination</nz-form-label>
-            <nz-form-control>
-              <nz-select
-                id="destinationInput"
-                [(ngModel)]="destination"
-                name="destination"
-                nzPlaceHolder="Select destination">
-                <nz-option
-                  nzValue="dataset"
-                  nzLabel="Dataset"></nz-option>
-                <nz-option
-                  nzValue="local"
-                  nzLabel="Local"></nz-option>
-              </nz-select>
-            </nz-form-control>
-          </nz-form-item>
-        </nz-col>
-      </nz-row>
-    </form>
-  </div>
-  <div
-    class="input-wrapper"
-    *ngIf="destination === 'dataset'">
-    <input
-      [(ngModel)]="inputDatasetName"
-      (input)="onUserInputDatasetName($event)"
-      type="text"
-      nz-input
-      name="datasetName"
-      placeholder="Search for dataset by name..."
-      [nzAutocomplete]="auto" />
-    <nz-autocomplete #auto>
-      <nz-auto-option
-        *ngFor="let dataset of filteredUserAccessibleDatasets"
-        [nzLabel]="dataset.dataset.name">
-        <div class="auto-option-content">
-          <div class="dataset-id-container">{{dataset.dataset.did?.toString()}}</div>
-
-          <span class="dataset-name">{{ dataset.dataset.name }}</span>
-
-          <button
-            nz-button
-            nzType="primary"
-            class="dataset-option-link-btn"
-            (click)="onClickExportResult('dataset', dataset)">
-            Save
-          </button>
-        </div>
-      </nz-auto-option>
-    </nz-autocomplete>
-    <nz-divider
-      nzText="or"
-      nzOrientation="center"></nz-divider>
-    <button
-      nz-button
-      nzType="dashed"
-      nzBlock
-      (click)="onClickCreateNewDataset()">
-      <span
-        nz-icon
-        nzType="plus-circle"></span>
-      Create New Dataset
-    </button>
-  </div>
-  <button
-    nz-button
-    nzType="default"
-    *ngIf="destination === 'local'"
-    (click)="onClickExportResult( 'local')">
-    Export
-  </button>
-</div>
diff --git a/core/gui/src/app/workspace/service/workflow-cache/workflow-cache.service.spec.ts b/core/gui/src/app/workspace/service/workflow-cache/workflow-cache.service.spec.ts
deleted file mode 100644
index 332731d9d9f..00000000000
--- a/core/gui/src/app/workspace/service/workflow-cache/workflow-cache.service.spec.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// import { inject, TestBed } from '@angular/core/testing';
-
-// import { CacheWorkflowService } from './cache-workflow.service';
-// import {
-//   mockPoint,
-//   mockResultPredicate,
-//   mockScanPredicate,
-//   mockScanResultLink
-// } from '../workflow-graph/model/mock-workflow-data';
-// import { WorkflowActionService } from '../workflow-graph/model/workflow-action.service';
-// import { UndoRedoService } from '../undo-redo/undo-redo.service';
-// import { marbles } from 'rxjs-marbles';
-// import { OperatorLink, OperatorPredicate, Point } from '../../types/workflow-common.interface';
-// import { OperatorMetadataService } from '../operator-metadata/operator-metadata.service';
-// import { HttpClient } from '@angular/common/http';
-// import { JointUIService } from '../joint-ui/joint-ui.service';
-// import { StubOperatorMetadataService } from '../operator-metadata/stub-operator-metadata.service';
-// import { WorkflowUtilService } from '../workflow-graph/util/workflow-util.service';
-// import { WorkflowInfo } from '../../../common/type/workflow';
-// import { PlainGroup } from '../workflow-graph/model/operator-group';
-
-// describe('CacheWorkFlowService', () => {
-//   let autoSaveWorkflowService: CacheWorkflowService;
-//   let workflowActionService: WorkflowActionService;
-//   beforeEach(() => {
-//     TestBed.configureTestingModule({
-//       providers: [
-//         CacheWorkflowService,
-//         WorkflowActionService,
-//         UndoRedoService,
-//         JointUIService,
-//         WorkflowUtilService,
-//         {provide: OperatorMetadataService, useClass: StubOperatorMetadataService},
-//         {provide: HttpClient}
-//       ]
-//     });
-
-//     // remove all items in local storage before each test
-//     localStorage.clear();
-//     autoSaveWorkflowService = TestBed.inject(CacheWorkflowService);
-//     workflowActionService = TestBed.inject(WorkflowActionService);
-//   });
-
-//   it('should be created', inject([CacheWorkflowService], (service: CacheWorkflowService) => {
-//     expect(service).toBeTruthy();
-//   }));
-
-//   it('should check if the local storage is updated when operator add event is triggered', marbles((m) => {
-//     autoSaveWorkflowService.handleAutoCacheWorkFlow();
-//     m.hot('-e-').do(() => workflowActionService.addOperator(mockScanPredicate, mockPoint))
-//       .delay(100).subscribe(
-//       () => {
-//         // get items in the storage
-//         const savedWorkflowJson = localStorage.getItem('workflow');
-//         if (!savedWorkflowJson) {
-//           expect(false).toBeTruthy();
-//           return;
-//         }
-
-//         const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-//         expect(savedWorkflow.operators.length).toEqual(1);
-//         expect(savedWorkflow.operators[0].operatorID).toEqual(mockScanPredicate.operatorID);
-//         expect(savedWorkflow.operators[0]).toEqual(mockScanPredicate);
-//         expect(savedWorkflow.operatorPositions[mockScanPredicate.operatorID]).toEqual(mockPoint);
-//       }
-//     );
-//   }));
-
-//   it('should check if the local storage is updated when operator delete event is triggered', marbles((m) => {
-//     autoSaveWorkflowService.handleAutoCacheWorkFlow();
-//     m.hot('-e-').do(() => {
-//       workflowActionService.addOperator(mockScanPredicate, mockPoint);
-//       workflowActionService.deleteOperator(mockScanPredicate.operatorID);
-//     })
-//       .delay(100).subscribe(
-//       () => {
-//         // get items in the storage
-//         const savedWorkflowJson = localStorage.getItem('workflow');
-//         if (!savedWorkflowJson) {
-//           expect(false).toBeTruthy();
-//           return;
-//         }
-
-//         const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-//         expect(savedWorkflow.operators.length).toEqual(0);
-//       }
-//     );
-//   }));
-
-//   it('should check if the local storage is updated when link add event is triggered', marbles((m) => {
-//     autoSaveWorkflowService.handleAutoCacheWorkFlow();
-//     m.hot('-e-').do(() => {
-//       workflowActionService.addOperator(mockScanPredicate, mockPoint);
-//       workflowActionService.addOperator(mockResultPredicate, mockPoint);
-//       workflowActionService.addLink(mockScanResultLink);
-//     })
-//       .delay(100).subscribe(
-//       () => {
-//         // get items in the storage
-//         const savedWorkflowJson = localStorage.getItem('workflow');
-//         if (!savedWorkflowJson) {
-//           expect(false).toBeTruthy();
-//           return;
-//         }
-
-//         const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-//         expect(savedWorkflow.operators.length).toEqual(2);
-//         expect(savedWorkflow.links.length).toEqual(1);
-//         expect(savedWorkflow.links[0]).toEqual(mockScanResultLink);
-//       }
-//     );
-//   }));
-
-//   it('should check if the local storage is updated when link delete event is triggered', marbles((m) => {
-//     autoSaveWorkflowService.handleAutoCacheWorkFlow();
-//     m.hot('-e-').do(() => {
-//       workflowActionService.addOperator(mockScanPredicate, mockPoint);
-//       workflowActionService.addOperator(mockResultPredicate, mockPoint);
-//       workflowActionService.addLink(mockScanResultLink);
-//       workflowActionService.deleteLink(mockScanResultLink.source, mockScanResultLink.target);
-//     })
-//       .delay(100).subscribe(
-//       () => {
-//         // get items in the storage
-//         const savedWorkflowJson = localStorage.getItem('workflow');
-//         if (!savedWorkflowJson) {
-//           expect(false).toBeTruthy();
-//           return;
-//         }
-
-//         const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-//         expect(savedWorkflow.operators.length).toEqual(2);
-//         expect(savedWorkflow.links.length).toEqual(0);
-//       }
-//     );
-//   }));
-
-//   it(`should check if the local storage is updated when operator delete event is triggered when there
-//       exists a link on the deleted operator`, marbles((m) => {
-//     autoSaveWorkflowService.handleAutoCacheWorkFlow();
-//     m.hot('-e-').do(() => {
-//       workflowActionService.addOperator(mockScanPredicate, mockPoint);
-//       workflowActionService.addOperator(mockResultPredicate, mockPoint);
-//       workflowActionService.addLink(mockScanResultLink);
-//       workflowActionService.deleteOperator(mockScanPredicate.operatorID);
-//     })
-//       .delay(100).subscribe(
-//       () => {
-//         // get items in the storage
-//         const savedWorkflowJson = localStorage.getItem('workflow');
-//         if (!savedWorkflowJson) {
-//           expect(false).toBeTruthy();
-//           return;
-//         }
-
-//         const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-//         expect(savedWorkflow.operators.length).toEqual(1);
-//         expect(savedWorkflow.operators[0]).toEqual(mockResultPredicate);
-//         expect(savedWorkflow.links.length).toEqual(0);
-//       }
-//     );
-//   }));
-
-//   it('should check if the local storage is updated when operator property change event is triggered', marbles((m) => {
-//     autoSaveWorkflowService.handleAutoCacheWorkFlow();
-//     const mockProperties = {tableName: 'mockTableName'};
-//     m.hot('-e-').do(() => {
-//       workflowActionService.addOperator(mockScanPredicate, mockPoint);
-//       workflowActionService.setOperatorProperty(mockScanPredicate.operatorID, mockProperties);
-//     })
-//       .delay(100).subscribe(
-//       () => {
-//         // get items in the storage
-//         const savedWorkflowJson = localStorage.getItem('workflow');
-//         if (!savedWorkflowJson) {
-//           expect(false).toBeTruthy();
-//           return;
-//         }
-
-//         const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-//         expect(savedWorkflow.operators.length).toEqual(1);
-//         expect(savedWorkflow.operators[0].operatorProperties).toEqual(mockProperties);
-//       }
-//     );
-//   }));
-
-//   it('should successfully loaded what is stored inside local storage when "loadWorkflow()" is called ', marbles((m) => {
-//     const operatorPositions: { [key: string]: Point } = {};
-//     operatorPositions[mockScanPredicate.operatorID] = mockPoint;
-//     const operators: OperatorPredicate[] = [];
-//     operators.push(mockScanPredicate);
-//     const links: OperatorLink[] = [];
-//     const groups: PlainGroup[] = [];
-
-//     const mockWorkflow: WorkflowInfo = {
-//       operators, operatorPositions, links, groups, breakpoints: {}
-//     };
-
-//     localStorage.setItem('workflow', JSON.stringify(mockWorkflow));
-
-//     autoSaveWorkflowService.loadWorkflow();
-
-//     const savedWorkflowJson = localStorage.getItem('workflow');
-//     if (!savedWorkflowJson) {
-//       expect(false).toBeTruthy();
-//       return;
-//     }
-
-//     const savedWorkflow: WorkflowInfo = JSON.parse(savedWorkflowJson);
-
-//     expect(savedWorkflow.operators.length).toEqual(1);
-//     expect(savedWorkflow.operators[0]).toEqual(mockScanPredicate);
-
-//   }));
-// });
diff --git a/core/gui/src/app/workspace/service/workflow-cache/workflow-cache.service.ts b/core/gui/src/app/workspace/service/workflow-cache/workflow-cache.service.ts
deleted file mode 100644
index ff751fa858e..00000000000
--- a/core/gui/src/app/workspace/service/workflow-cache/workflow-cache.service.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Injectable } from "@angular/core";
-import { Workflow } from "../../../common/type/workflow";
-import { localGetObject, localRemoveObject, localSetObject } from "../../../common/util/storage";
-
-@Injectable({
-  providedIn: "root",
-})
-export class WorkflowCacheService {
-  private static readonly WORKFLOW_KEY: string = "workflow";
-
-  public getCachedWorkflow(): Readonly<Workflow> | undefined {
-    return localGetObject<Workflow>(WorkflowCacheService.WORKFLOW_KEY);
-  }
-
-  public resetCachedWorkflow() {
-    localRemoveObject(WorkflowCacheService.WORKFLOW_KEY);
-  }
-
-  public setCacheWorkflow(workflow: Workflow | undefined): void {
-    localSetObject(WorkflowCacheService.WORKFLOW_KEY, workflow);
-  }
-}
diff --git a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts
deleted file mode 100644
index d2a4b5ae4f2..00000000000
--- a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import * as Papa from "papaparse";
-import { Injectable } from "@angular/core";
-import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
-import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
-import { BehaviorSubject, EMPTY, expand, finalize, merge, Observable, of } from "rxjs";
-import { PaginatedResultEvent, ResultExportResponse } from "../../types/workflow-websocket.interface";
-import { NotificationService } from "../../../common/service/notification/notification.service";
-import { ExecuteWorkflowService } from "../execute-workflow/execute-workflow.service";
-import { ExecutionState, isNotInExecution } from "../../types/execute-workflow.interface";
-import { filter } from "rxjs/operators";
-import { OperatorResultService, WorkflowResultService } from "../workflow-result/workflow-result.service";
-import { DownloadService } from "../../../dashboard/service/user/download/download.service";
-import { HttpResponse } from "@angular/common/http";
-import { ExportWorkflowJsonResponse } from "../../../dashboard/service/user/download/download.service";
-import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit";
-import { GuiConfigService } from "../../../common/service/gui-config.service";
-
-@Injectable({
-  providedIn: "root",
-})
-export class WorkflowResultExportService {
-  hasResultToExportOnHighlightedOperators: boolean = false;
-  hasResultToExportOnAllOperators = new BehaviorSubject<boolean>(false);
-  constructor(
-    private workflowWebsocketService: WorkflowWebsocketService,
-    private workflowActionService: WorkflowActionService,
-    private notificationService: NotificationService,
-    private executeWorkflowService: ExecuteWorkflowService,
-    private workflowResultService: WorkflowResultService,
-    private downloadService: DownloadService,
-    private config: GuiConfigService
-  ) {
-    this.registerResultToExportUpdateHandler();
-  }
-
-  registerResultToExportUpdateHandler() {
-    merge(
-      this.executeWorkflowService
-        .getExecutionStateStream()
-        .pipe(filter(({ previous, current }) => current.state === ExecutionState.Completed)),
-      this.workflowActionService.getJointGraphWrapper().getJointOperatorHighlightStream(),
-      this.workflowActionService.getJointGraphWrapper().getJointOperatorUnhighlightStream()
-    ).subscribe(() => {
-      // check if there are any results to export on highlighted operators (either paginated or snapshot)
-      this.hasResultToExportOnHighlightedOperators =
-        isNotInExecution(this.executeWorkflowService.getExecutionState().state) &&
-        this.workflowActionService
-          .getJointGraphWrapper()
-          .getCurrentHighlightedOperatorIDs()
-          .filter(
-            operatorId =>
-              this.workflowResultService.hasAnyResult(operatorId) ||
-              this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined
-          ).length > 0;
-
-      // check if there are any results to export on all operators (either paginated or snapshot)
-      let staticHasResultToExportOnAllOperators =
-        isNotInExecution(this.executeWorkflowService.getExecutionState().state) &&
-        this.workflowActionService
-          .getTexeraGraph()
-          .getAllOperators()
-          .map(operator => operator.operatorID)
-          .filter(
-            operatorId =>
-              this.workflowResultService.hasAnyResult(operatorId) ||
-              this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined
-          ).length > 0;
-
-      // Notify subscribers of changes
-      this.hasResultToExportOnAllOperators.next(staticHasResultToExportOnAllOperators);
-    });
-  }
-
-  /**
-   * export the workflow execution result according the export type
-   */
-  exportWorkflowExecutionResult(
-    exportType: string,
-    workflowName: string,
-    datasetIds: number[],
-    rowIndex: number,
-    columnIndex: number,
-    filename: string,
-    exportAll: boolean = false, // if the user click export button on the top bar (a.k.a menu),
-    // we should export all operators, otherwise, only highlighted ones
-    // which means export button is selected from context-menu
-    destination: "dataset" | "local" = "dataset", // default to dataset
-    unit: DashboardWorkflowComputingUnit | null // computing unit for cluster setting
-  ): void {
-    if (!this.config.env.exportExecutionResultEnabled) {
-      return;
-    }
-    if (unit === null) {
-      this.notificationService.error("Cannot export result: computing unit is not available");
-      return;
-    }
-
-    const workflowId = this.workflowActionService.getWorkflow().wid;
-    if (!workflowId) {
-      this.notificationService.error("Cannot export result: workflow ID is not available");
-      return;
-    }
-
-    // gather operator IDs
-    const operatorIds = exportAll
-      ? this.workflowActionService
-          .getTexeraGraph()
-          .getAllOperators()
-          .map(operator => operator.operatorID)
-      : [...this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs()];
-
-    const operatorArray = operatorIds.map(operatorId => {
-      return {
-        id: operatorId,
-        outputType: this.workflowResultService.determineOutputExtension(operatorId, exportType),
-      };
-    });
-
-    if (operatorIds.length === 0) {
-      return;
-    }
-
-    // show loading
-    this.notificationService.loading("Exporting...");
-
-    // Make request
-    this.downloadService
-      .exportWorkflowResult(
-        exportType,
-        workflowId,
-        workflowName,
-        operatorArray,
-        [...datasetIds],
-        rowIndex,
-        columnIndex,
-        filename,
-        destination,
-        unit
-      )
-      .subscribe({
-        next: response => {
-          if (destination === "local") {
-            // "local" => response is a blob
-            // We can parse the file name from header or use fallback
-            this.downloadService.saveBlobFile(response, filename);
-            this.notificationService.info("Files downloaded successfully");
-          } else {
-            // "dataset" => response is JSON
-            // The server should return a JSON with {status, message}
-            const jsonResponse = response as HttpResponse<ExportWorkflowJsonResponse>;
-            const responseBody = jsonResponse.body;
-            if (responseBody && responseBody.status === "success") {
-              this.notificationService.success("Result exported successfully");
-            } else {
-              this.notificationService.error(responseBody?.message || "An error occurred during export");
-            }
-          }
-        },
-        error: (err: unknown) => {
-          const errorMessage = (err as any)?.error?.message || (err as any)?.error || err;
-          this.notificationService.error(`An error happened in exporting operator results: ${errorMessage}`);
-        },
-      });
-  }
-
-  /**
-   * Reset flags if the user leave workspace
-   */
-  public resetFlags(): void {
-    this.hasResultToExportOnHighlightedOperators = false;
-    this.hasResultToExportOnAllOperators = new BehaviorSubject<boolean>(false);
-  }
-
-  getExportOnAllOperatorsStatusStream(): Observable<boolean> {
-    return this.hasResultToExportOnAllOperators.asObservable();
-  }
-}
diff --git a/core/gui/src/assets/workflow_gui.png b/core/gui/src/assets/workflow_gui.png
deleted file mode 100644
index 76cd4d88b62..00000000000
Binary files a/core/gui/src/assets/workflow_gui.png and /dev/null differ
diff --git a/core/log/.gitkeep b/core/log/.gitkeep
deleted file mode 100644
index 8b137891791..00000000000
--- a/core/log/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
deleted file mode 100644
index 895f6a400af..00000000000
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package edu.uci.ics.texera.service.resource
-
-import jakarta.ws.rs.core.MediaType
-import jakarta.ws.rs.{GET, Path, Produces}
-
-@Path("/healthcheck")
-@Produces(Array(MediaType.APPLICATION_JSON))
-class HealthCheckResource {
-  @GET
-  def healthCheck: Map[String, String] = Map("status" -> "ok")
-}
diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ExecutionResourcesMapping.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ExecutionResourcesMapping.scala
deleted file mode 100644
index faf71834730..00000000000
--- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ExecutionResourcesMapping.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package edu.uci.ics.amber.core.storage.result
-
-import edu.uci.ics.amber.core.virtualidentity.ExecutionIdentity
-
-import java.net.URI
-import scala.collection.mutable
-
-/**
-  * ExecutionResourcesMapping is a singleton for keeping track of resources associated with each execution.
-  *   It maintains a mapping from execution ID to a list of URIs, which point to resources like the result storage.
-  *
-  * Currently, this mapping is only used during the resource clean-up phase.
-  *
-  * This design has one limitation: the singleton is only accessible on the master node.
-  * While this aligns with the current system design, improvements are needed in the
-  * future to enhance scalability and flexibility.
-  *
-  * TODO: Move the mappings to an external, distributed, and persistent location to eliminate the master-node
-  *   dependency.
-  */
-object ExecutionResourcesMapping {
-
-  private val executionIdToExecutionResourcesMapping: mutable.Map[ExecutionIdentity, List[URI]] =
-    mutable.Map.empty
-
-  /**
-    * Get the URIs of given execution Id
-    * @param executionIdentity the target execution id
-    * @return
-    */
-  def getResourceURIs(executionIdentity: ExecutionIdentity): List[URI] = {
-    executionIdToExecutionResourcesMapping.getOrElseUpdate(executionIdentity, List())
-  }
-
-  /**
-    * Add the URI to the mapping
-    * @param executionIdentity the target execution
-    * @param uri the URI of the resource
-    */
-  def addResourceUri(executionIdentity: ExecutionIdentity, uri: URI): Unit = {
-    executionIdToExecutionResourcesMapping.updateWith(executionIdentity) {
-      case Some(existingUris) => Some(uri :: existingUris) // Prepend URI to the existing list
-      case None               => Some(List(uri)) // Create a new list if key doesn't exist
-    }
-  }
-
-  /**
-    * Remove all resources associated with a given execution ID.
-    *
-    * @param executionIdentity the target execution ID
-    * @return true if the entry was removed, false if it did not exist
-    */
-  def removeExecutionResources(executionIdentity: ExecutionIdentity): Boolean = {
-    executionIdToExecutionResourcesMapping.remove(executionIdentity).isDefined
-  }
-}
diff --git a/deployment/computing-unit-master.dockerfile b/deployment/computing-unit-master.dockerfile
deleted file mode 100644
index 0f10729527e..00000000000
--- a/deployment/computing-unit-master.dockerfile
+++ /dev/null
@@ -1,110 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.9.3_2.13.11 AS build
-
-# Set working directory
-WORKDIR /core
-
-# Copy all projects under core to /core
-COPY core/ .
-
-# Update system and install dependencies
-RUN apt-get update && apt-get install -y \
-    netcat \
-    unzip \
-    libpq-dev \
-    && apt-get clean
-
-WORKDIR /core
-# Add .git for runtime calls to jgit from OPversion
-COPY .git ../.git
-
-RUN sbt clean WorkflowExecutionService/dist
-
-# Unzip the texera binary
-RUN unzip amber/target/universal/texera-*.zip -d amber/target/
-
-FROM eclipse-temurin:11-jdk-jammy AS runtime
-
-WORKDIR /core/amber
-
-COPY --from=build /core/amber/r-requirements.txt /tmp/r-requirements.txt
-COPY --from=build /core/amber/requirements.txt /tmp/requirements.txt
-COPY --from=build /core/amber/operator-requirements.txt /tmp/operator-requirements.txt
-
-# Install Python & R runtime dependencies
-RUN apt-get update && apt-get install -y \
-    python3-pip \
-    python3-dev \
-    libpq-dev \
-    gfortran \
-    curl \
-    build-essential \
-    libreadline-dev \
-    libncurses-dev \
-    libssl-dev \
-    libxml2-dev \
-    xorg-dev \
-    libbz2-dev \
-    liblzma-dev \
-    libpcre++-dev \
-    libpango1.0-dev \
-     libcurl4-openssl-dev \
-    unzip \
-    && apt-get clean
-
-# Install R and needed libraries
-ENV R_VERSION=4.3.3
-RUN curl -O https://cran.r-project.org/src/base/R-4/R-${R_VERSION}.tar.gz && \
-    tar -xf R-${R_VERSION}.tar.gz && \
-    cd R-${R_VERSION} && \
-    ./configure --prefix=/usr/local \
-                --enable-R-shlib \
-                --with-blas \
-                --with-lapack && \
-    make -j 4 && \
-    make install && \
-    cd .. && \
-    rm -rf R-${R_VERSION}* && R --version && pip3 install --upgrade pip setuptools wheel && \
-    pip3 install -r /tmp/requirements.txt && \
-    pip3 install -r /tmp/operator-requirements.txt && \
-    pip3 install -r /tmp/r-requirements.txt
-# Install R packages, pinning arrow to 14.0.2.1 explicitly
-RUN Rscript -e "options(repos = c(CRAN = 'https://cran.r-project.org')); \
-                install.packages(c('coro', 'dplyr'), \
-                                 Ncpus = parallel::detectCores())" && \
-    Rscript -e "options(repos = c(CRAN = 'https://cran.r-project.org')); \
-                if (!requireNamespace('remotes', quietly=TRUE)) \
-                  install.packages('remotes'); \
-                remotes::install_version('arrow', version='14.0.2.1', \
-                  repos='https://cran.r-project.org', upgrade='never'); \
-                cat('R arrow version: ', as.character(packageVersion('arrow')), '\n')"
-ENV LD_LIBRARY_PATH=/usr/local/lib/R/lib:$LD_LIBRARY_PATH
-
-# Copy the built texera binary from the build phase
-COPY --from=build /.git /.git
-COPY --from=build /core/amber/target/texera-* /core/amber
-# Copy resources directories under /core from build phase
-COPY --from=build /core/config/src/main/resources /core/config/src/main/resources
-COPY --from=build /core/amber/src/main/resources /core/amber/src/main/resources
-# Copy code for python & R UDF
-COPY --from=build /core/amber/src/main/python /core/amber/src/main/python
-
-CMD ["bin/computing-unit-master"]
-
-EXPOSE 8085
diff --git a/deployment/k8s/texera-helmchart/files/texera_ddl.sql b/deployment/k8s/texera-helmchart/files/texera_ddl.sql
deleted file mode 100644
index 67c5f573ecb..00000000000
--- a/deployment/k8s/texera-helmchart/files/texera_ddl.sql
+++ /dev/null
@@ -1,470 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- CREATE LakeFS db
-DROP DATABASE IF EXISTS texera_lakefs;
-CREATE DATABASE texera_lakefs;
-
--- CREATE iceberg catalog db
-
-\c postgres
-
-DO $$
-BEGIN
-        IF NOT EXISTS (
-            SELECT FROM pg_catalog.pg_roles WHERE rolname = 'texera'
-        ) THEN
-CREATE ROLE texera LOGIN PASSWORD 'password';
-END IF;
-END
-$$;
-
--- Drop and recreate the database
-DROP DATABASE IF EXISTS texera_iceberg_catalog;
-CREATE DATABASE texera_iceberg_catalog;
-
--- Grant and change ownership
-GRANT ALL PRIVILEGES ON DATABASE texera_iceberg_catalog TO texera;
-ALTER DATABASE texera_iceberg_catalog OWNER TO texera;
-
--- Reconnect to the new database
-\c texera_iceberg_catalog
-
--- Grant schema access
-GRANT ALL ON SCHEMA public TO texera;
-
-
--- CREATE texera_db
-
--- ============================================
--- 1. Drop and recreate the database (psql only)
---    Remove if you already created texera_db
--- ============================================
-\c postgres
-DROP DATABASE IF EXISTS texera_db;
-CREATE DATABASE texera_db;
-
--- ============================================
--- 2. Connect to the new database (psql only)
--- ============================================
-\c texera_db
-
-CREATE SCHEMA IF NOT EXISTS texera_db;
-SET search_path TO texera_db, public;
-
--- ============================================
--- 3. Drop all tables if they exist
---    (CASCADE handles FK dependencies)
--- ============================================
-DROP TABLE IF EXISTS operator_executions CASCADE;
-DROP TABLE IF EXISTS operator_port_executions CASCADE;
-DROP TABLE IF EXISTS workflow_user_access CASCADE;
-DROP TABLE IF EXISTS workflow_of_user CASCADE;
-DROP TABLE IF EXISTS user_config CASCADE;
-DROP TABLE IF EXISTS "user" CASCADE;
-DROP TABLE IF EXISTS user_last_active_time CASCADE;
-DROP TABLE IF EXISTS workflow CASCADE;
-DROP TABLE IF EXISTS workflow_version CASCADE;
-DROP TABLE IF EXISTS project CASCADE;
-DROP TABLE IF EXISTS workflow_of_project CASCADE;
-DROP TABLE IF EXISTS workflow_executions CASCADE;
-DROP TABLE IF EXISTS dataset CASCADE;
-DROP TABLE IF EXISTS dataset_user_access CASCADE;
-DROP TABLE IF EXISTS dataset_version CASCADE;
-DROP TABLE IF EXISTS public_project CASCADE;
-DROP TABLE IF EXISTS project_user_access CASCADE;
-DROP TABLE IF EXISTS workflow_user_likes CASCADE;
-DROP TABLE IF EXISTS workflow_user_clones CASCADE;
-DROP TABLE IF EXISTS workflow_view_count CASCADE;
-DROP TABLE IF EXISTS user_action CASCADE;
-DROP TABLE IF EXISTS dataset_user_likes CASCADE;
-DROP TABLE IF EXISTS dataset_view_count CASCADE;
-DROP TABLE IF EXISTS site_settings CASCADE;
-DROP TABLE IF EXISTS computing_unit_user_access CASCADE;
-
--- ============================================
--- 4. Create PostgreSQL enum types
---    to mimic MySQL ENUM fields
--- ============================================
-DROP TYPE IF EXISTS user_role_enum CASCADE;
-DROP TYPE IF EXISTS privilege_enum CASCADE;
-DROP TYPE IF EXISTS action_enum CASCADE;
-
-CREATE TYPE user_role_enum AS ENUM ('INACTIVE', 'RESTRICTED', 'REGULAR', 'ADMIN');
-CREATE TYPE action_enum AS ENUM ('like', 'unlike', 'view', 'clone');
-CREATE TYPE privilege_enum AS ENUM ('NONE', 'READ', 'WRITE');
-CREATE TYPE workflow_computing_unit_type_enum AS ENUM ('local', 'kubernetes');
-
--- ============================================
--- 5. Create tables
--- ============================================
-
--- "user" table
-CREATE TABLE IF NOT EXISTS "user"
-(
-    uid                     SERIAL PRIMARY KEY,
-    name                    VARCHAR(256) NOT NULL,
-    email                   VARCHAR(256) UNIQUE,
-    password                VARCHAR(256),
-    google_id               VARCHAR(256) UNIQUE,
-    google_avatar           VARCHAR(100),
-    role                    user_role_enum NOT NULL DEFAULT 'INACTIVE',
-    comment                 TEXT,
-    account_creation_time   TIMESTAMPTZ NOT NULL DEFAULT now(),
-    -- check that either password or google_id is not null
-    CONSTRAINT ck_nulltest CHECK ((password IS NOT NULL) OR (google_id IS NOT NULL))
-    );
-
--- user_config
-CREATE TABLE IF NOT EXISTS user_config
-(
-    uid   INT NOT NULL,
-    key   VARCHAR(256) NOT NULL,
-    value TEXT NOT NULL,
-    PRIMARY KEY (uid, key),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
-    );
-
--- workflow
-CREATE TABLE IF NOT EXISTS workflow
-(
-    wid                SERIAL PRIMARY KEY,
-    name               VARCHAR(128) NOT NULL,
-    description        VARCHAR(500),
-    content            TEXT NOT NULL,
-    creation_time      TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    last_modified_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    is_public          BOOLEAN NOT NULL DEFAULT false
-    );
-
--- workflow_of_user
-CREATE TABLE IF NOT EXISTS workflow_of_user
-(
-    uid INT NOT NULL,
-    wid INT NOT NULL,
-    PRIMARY KEY (uid, wid),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE
-    );
-
--- workflow_user_access
-CREATE TABLE IF NOT EXISTS workflow_user_access
-(
-    uid       INT NOT NULL,
-    wid       INT NOT NULL,
-    privilege privilege_enum NOT NULL DEFAULT 'NONE',
-    PRIMARY KEY (uid, wid),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE
-    );
-
--- workflow_version
-CREATE TABLE IF NOT EXISTS workflow_version
-(
-    vid            SERIAL PRIMARY KEY,
-    wid            INT NOT NULL,
-    content        TEXT NOT NULL,
-    creation_time  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE
-    );
-
--- project
-CREATE TABLE IF NOT EXISTS project
-(
-    pid            SERIAL PRIMARY KEY,
-    name           VARCHAR(128) NOT NULL,
-    description    VARCHAR(10000),
-    owner_id       INT NOT NULL,
-    creation_time  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    color          VARCHAR(6),
-    UNIQUE (owner_id, name),
-    FOREIGN KEY (owner_id) REFERENCES "user"(uid) ON DELETE CASCADE
-    );
-
--- workflow_of_project
-CREATE TABLE IF NOT EXISTS workflow_of_project
-(
-    wid INT NOT NULL,
-    pid INT NOT NULL,
-    PRIMARY KEY (wid, pid),
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE,
-    FOREIGN KEY (pid) REFERENCES project(pid) ON DELETE CASCADE
-    );
-
--- project_user_access
-CREATE TABLE IF NOT EXISTS project_user_access
-(
-    uid       INT NOT NULL,
-    pid       INT NOT NULL,
-    privilege privilege_enum NOT NULL DEFAULT 'NONE',
-    PRIMARY KEY (uid, pid),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (pid) REFERENCES project(pid) ON DELETE CASCADE
-    );
-
--- workflow_computing_unit table
-CREATE TABLE IF NOT EXISTS workflow_computing_unit
-(
-    uid                INT           NOT NULL,
-    name               VARCHAR(128)  NOT NULL,
-    cuid               SERIAL PRIMARY KEY,
-    creation_time      TIMESTAMP  NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    terminate_time     TIMESTAMP  DEFAULT NULL,
-    type               workflow_computing_unit_type_enum,
-    uri                TEXT NOT NULL DEFAULT '',
-    resource           TEXT DEFAULT '',
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
-    );
-
--- workflow_executions
-CREATE TABLE IF NOT EXISTS workflow_executions
-(
-    eid                 SERIAL PRIMARY KEY,
-    vid                 INT NOT NULL,
-    uid                 INT NOT NULL,
-    cuid                INT,
-    status              SMALLINT NOT NULL DEFAULT 1,
-    result              TEXT,
-    starting_time       TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    last_update_time    TIMESTAMP,
-    bookmarked          BOOLEAN DEFAULT FALSE,
-    name                VARCHAR(128) NOT NULL DEFAULT 'Untitled Execution',
-    environment_version VARCHAR(128) NOT NULL,
-    log_location        TEXT,
-    runtime_stats_uri   TEXT,
-    runtime_stats_size  INT DEFAULT 0,
-    FOREIGN KEY (vid) REFERENCES workflow_version(vid) ON DELETE CASCADE,
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (cuid) REFERENCES workflow_computing_unit(cuid) ON DELETE CASCADE
-    );
-
--- public_project
-CREATE TABLE IF NOT EXISTS public_project
-(
-    pid INT PRIMARY KEY,
-    uid INT,
-    FOREIGN KEY (pid) REFERENCES project(pid) ON DELETE CASCADE
-    -- Note: MySQL schema doesn't define a foreign key for uid
-    );
-
--- dataset
-CREATE TABLE IF NOT EXISTS dataset
-(
-    did            SERIAL PRIMARY KEY,
-    owner_uid      INT NOT NULL,
-    name           VARCHAR(128) NOT NULL,
-    repository_name VARCHAR(128),
-    is_public      BOOLEAN NOT NULL DEFAULT TRUE,
-    is_downloadable BOOLEAN NOT NULL DEFAULT TRUE,
-    description    VARCHAR(512) NOT NULL,
-    creation_time  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (owner_uid) REFERENCES "user"(uid) ON DELETE CASCADE
-    );
-
--- dataset_user_access
-CREATE TABLE IF NOT EXISTS dataset_user_access
-(
-    did       INT NOT NULL,
-    uid       INT NOT NULL,
-    privilege privilege_enum NOT NULL DEFAULT 'NONE',
-    PRIMARY KEY (did, uid),
-    FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE,
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
-    );
-
--- dataset_version
-CREATE TABLE IF NOT EXISTS dataset_version
-(
-    dvid          SERIAL PRIMARY KEY,
-    did           INT NOT NULL,
-    creator_uid   INT NOT NULL,
-    name          VARCHAR(128) NOT NULL,
-    version_hash  VARCHAR(64) NOT NULL,
-    creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE
-    );
-
--- operator_executions (modified to match MySQL: no separate primary key; added console_messages_uri)
-CREATE TABLE IF NOT EXISTS operator_executions
-(
-    workflow_execution_id INT NOT NULL,
-    operator_id           VARCHAR(100) NOT NULL,
-    console_messages_uri  TEXT,
-    console_messages_size INT DEFAULT 0,
-    PRIMARY KEY (workflow_execution_id, operator_id),
-    FOREIGN KEY (workflow_execution_id) REFERENCES workflow_executions(eid) ON DELETE CASCADE
-    );
-
--- operator_port_executions
-CREATE TABLE operator_port_executions
-(
-    workflow_execution_id INT NOT NULL,
-    global_port_id        VARCHAR(200) NOT NULL,
-    result_uri            TEXT,
-    result_size           INT DEFAULT 0,
-    PRIMARY KEY (workflow_execution_id, global_port_id),
-    FOREIGN KEY (workflow_execution_id) REFERENCES workflow_executions(eid) ON DELETE CASCADE
-);
-
--- workflow_user_likes
-CREATE TABLE IF NOT EXISTS workflow_user_likes
-(
-    uid INT NOT NULL,
-    wid INT NOT NULL,
-    PRIMARY KEY (uid, wid),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE
-    );
-
--- workflow_user_clones
-CREATE TABLE IF NOT EXISTS workflow_user_clones
-(
-    uid INT NOT NULL,
-    wid INT NOT NULL,
-    PRIMARY KEY (uid, wid),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE
-    );
-
--- workflow_view_count
-CREATE TABLE IF NOT EXISTS workflow_view_count
-(
-    wid        INT NOT NULL PRIMARY KEY,
-    view_count INT NOT NULL DEFAULT 0,
-    FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE
-    );
-
--- user_action table
-CREATE TABLE IF NOT EXISTS user_action (
-    user_action_id BIGSERIAL PRIMARY KEY,
-    uid            INTEGER,
-    ip             VARCHAR(15),
-    action_time    TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    resource_type  VARCHAR(15) NOT NULL,
-    resource_id    INTEGER NOT NULL,
-    action         texera_db.action_enum NOT NULL,
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE SET NULL
-);
-
-
--- dataset_user_likes table
-CREATE TABLE IF NOT EXISTS dataset_user_likes
-(
-    uid INTEGER NOT NULL,
-    did INTEGER NOT NULL,
-    PRIMARY KEY (uid, did),
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE,
-    FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE
-    );
-
--- dataset_view_count table
-CREATE TABLE IF NOT EXISTS dataset_view_count
-(
-    did        INTEGER NOT NULL,
-    view_count INTEGER NOT NULL DEFAULT 0,
-    PRIMARY KEY (did),
-    FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE
-    );
-
--- site_settings table
-CREATE TABLE IF NOT EXISTS site_settings
-(
-    key         VARCHAR(255) PRIMARY KEY,
-    value       TEXT NOT NULL,
-    updated_by  VARCHAR(50),
-    updated_at  TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    );
-
--- user_last_active_time table
-CREATE TABLE IF NOT EXISTS user_last_active_time
-(
-    uid            INT          NOT NULL
-        PRIMARY KEY
-        REFERENCES "user"(uid),
-    last_active_time     TIMESTAMPTZ
-);
-
--- computing_unit_user_access table
-CREATE TABLE IF NOT EXISTS computing_unit_user_access
-(
-    cuid      INT NOT NULL,
-    uid       INT NOT NULL,
-    privilege privilege_enum NOT NULL DEFAULT 'NONE',
-    PRIMARY KEY (cuid, uid),
-    FOREIGN KEY (cuid) REFERENCES workflow_computing_unit(cuid) ON DELETE CASCADE,
-    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
-);
-
--- START Fulltext search index creation (DO NOT EDIT THIS LINE)
-CREATE EXTENSION IF NOT EXISTS pgroonga;
-
-DO $$
-DECLARE
-r RECORD;
-  stem_filter TEXT := '';
-  plugin_status TEXT;
-BEGIN
-  -- Drop all GIN and PGroonga indexes
-FOR r IN
-SELECT indexname FROM pg_indexes
-WHERE (indexdef ILIKE '%USING gin%' OR indexdef ILIKE '%USING pgroonga%')
-  AND tablename IN ('workflow', 'user', 'project', 'dataset', 'dataset_version')
-    LOOP
-    EXECUTE format('DROP INDEX IF EXISTS %I;', r.indexname);
-END LOOP;
-
-  -- Check if TokenFilterStem plugin is registered
-WITH plugin_registration AS (
-    SELECT pgroonga_command('plugin_register token_filters/stem') AS result
-)
-SELECT
-    CASE
-        WHEN result::jsonb @> '[true]' THEN 'Plugin registered successfully'
-        ELSE 'Plugin registration failed'
-        END INTO plugin_status
-FROM plugin_registration;
-
--- Set the stem_filter based on plugin status
-IF plugin_status = 'Plugin registered successfully' THEN
-    stem_filter := ', plugins=''token_filters/stem'', token_filters=''TokenFilterStem''';
-    RAISE NOTICE 'Using TokenMecab + TokenFilterStem';
-ELSE
-    RAISE NOTICE 'Using TokenMecab only';
-END IF;
-
-  -- Create PGroonga indexes dynamically with correct TokenFilterStem usage
-FOR r IN
-SELECT tablename,
-       CASE
-           WHEN tablename = 'workflow' THEN
-               '(COALESCE(name, '''') || '' '' || COALESCE(description, '''') || '' '' || COALESCE(content, ''''))'
-           WHEN tablename IN ('project', 'dataset') THEN
-               '(COALESCE(name, '''') || '' '' || COALESCE(description, ''''))'
-           ELSE
-               'COALESCE(name, '''')'
-           END AS index_column
-FROM (VALUES ('workflow'), ('user'), ('project'), ('dataset'), ('dataset_version')) AS t(tablename)
-    LOOP
-    -- Create PGroonga index with proper TokenFilterStem usage
-    EXECUTE format(
-      'CREATE INDEX idx_%s_pgroonga ON %I USING pgroonga (%s) WITH (tokenizer = ''TokenMecab''%s);',
-      r.tablename, r.tablename, r.index_column, stem_filter
-    );
-END LOOP;
-END $$;
-
--- END Fulltext search index creation (DO NOT EDIT THIS LINE)
diff --git a/core/file-service/build.sbt b/file-service/build.sbt
similarity index 95%
rename from core/file-service/build.sbt
rename to file-service/build.sbt
index 236489e5c25..34b30472e0c 100644
--- a/core/file-service/build.sbt
+++ b/file-service/build.sbt
@@ -18,7 +18,7 @@
 import scala.collection.Seq
 
 name := "file-service"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
@@ -84,7 +84,4 @@ libraryDependencies ++= Seq(
   "jakarta.ws.rs" % "jakarta.ws.rs-api" % "3.1.0", // Ensure Jakarta JAX-RS API is available
   "org.bitbucket.b_c" % "jose4j" % "0.9.6",
   "org.playframework" %% "play-json" % "3.1.0-M1",
-  "software.amazon.awssdk" % "s3" % "2.29.51",
-  "software.amazon.awssdk" % "auth" % "2.29.51",
-  "software.amazon.awssdk" % "regions" % "2.29.51",
 )
diff --git a/core/file-service/src/main/resources/docker-compose.yml b/file-service/src/main/resources/docker-compose.yml
similarity index 83%
rename from core/file-service/src/main/resources/docker-compose.yml
rename to file-service/src/main/resources/docker-compose.yml
index fbef6cc3b5b..f4d2a072562 100644
--- a/core/file-service/src/main/resources/docker-compose.yml
+++ b/file-service/src/main/resources/docker-compose.yml
@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-version: "3.5"
 name: texera-lakefs
 services:
   minio:
     image: minio/minio:RELEASE.2025-02-28T09-55-16Z
-    container_name: minio
+    container_name: texera-lakefs-minio
+    restart: unless-stopped
     ports:
       - "9000:9000"
       - "9001:9001"
@@ -28,14 +28,14 @@ services:
       - MINIO_ROOT_USER=texera_minio
       - MINIO_ROOT_PASSWORD=password
     command: server --console-address ":9001" /data
-#   Below lines are recommended to uncomment in order to persist your data even if the container dies
-#    volumes:
-#      - /path/to/your/local/directory:/data
+    # The lines below are recommended to mount a host path in order to persist your data even if the container is removed.
+    volumes:
+      - minio_data:/data
 
   postgres:
     image: postgres:15
-    container_name: postgres
-    restart: always
+    container_name: texera-lakefs-postgres
+    restart: unless-stopped
     environment:
       - POSTGRES_DB=texera_lakefs
       - POSTGRES_USER=texera_lakefs_admin
@@ -45,13 +45,14 @@ services:
       interval: 10s
       retries: 5
       start_period: 5s
-#   Ditto
-#    volumes:
-#      - /path/to/your/local/directory:/var/lib/postgresql/data
+    # Ditto
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
 
   lakefs:
     image: treeverse/lakefs:1.51
-    container_name: lakefs
+    container_name: texera-lakefs-lakefs
+    restart: unless-stopped
     depends_on:
       postgres:
         condition: service_healthy
@@ -89,4 +90,9 @@ services:
 
 networks:
   default:
-    name: texera-lakefs
\ No newline at end of file
+    name: texera-lakefs
+
+# Named Docker volumes — uncomment the following lines if you mounted host paths above.
+volumes:
+  minio_data:
+  postgres_data:
diff --git a/core/file-service/src/main/resources/file-service-web-config.yaml b/file-service/src/main/resources/file-service-web-config.yaml
similarity index 100%
rename from core/file-service/src/main/resources/file-service-web-config.yaml
rename to file-service/src/main/resources/file-service-web-config.yaml
diff --git a/core/file-service/src/main/resources/minio-config.yml b/file-service/src/main/resources/minio-config.yml
similarity index 100%
rename from core/file-service/src/main/resources/minio-config.yml
rename to file-service/src/main/resources/minio-config.yml
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/FileService.scala b/file-service/src/main/scala/org/apache/texera/service/FileService.scala
similarity index 84%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/FileService.scala
rename to file-service/src/main/scala/org/apache/texera/service/FileService.scala
index 02c2b3fc84e..a92eaca511a 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/FileService.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/FileService.scala
@@ -17,29 +17,30 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import com.fasterxml.jackson.databind.module.SimpleModule
-import io.dropwizard.core.Application
-import io.dropwizard.core.setup.{Bootstrap, Environment}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.core.storage.util.LakeFSStorageClient
-import edu.uci.ics.amber.util.PathUtils.fileServicePath
-import edu.uci.ics.texera.auth.{JwtAuthFilter, SessionUser}
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.service.`type`.DatasetFileNode
-import edu.uci.ics.texera.service.`type`.serde.DatasetFileNodeSerializer
-import edu.uci.ics.texera.service.resource.{
+import io.dropwizard.auth.AuthDynamicFeature
+import io.dropwizard.core.Application
+import io.dropwizard.core.setup.{Bootstrap, Environment}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.core.storage.util.LakeFSStorageClient
+import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.service.`type`.DatasetFileNode
+import org.apache.texera.service.`type`.serde.DatasetFileNodeSerializer
+import org.apache.texera.service.resource.{
   DatasetAccessResource,
   DatasetResource,
   HealthCheckResource
 }
-import edu.uci.ics.texera.service.util.S3StorageClient
-import io.dropwizard.auth.AuthDynamicFeature
+import org.apache.texera.service.util.S3StorageClient
 import org.eclipse.jetty.server.session.SessionHandler
 
+import java.nio.file.Path
+
 class FileService extends Application[FileServiceConfiguration] with LazyLogging {
   override def initialize(bootstrap: Bootstrap[FileServiceConfiguration]): Unit = {
     // Register Scala module to Dropwizard default object mapper
@@ -86,7 +87,9 @@ class FileService extends Application[FileServiceConfiguration] with LazyLogging
 object FileService {
   def main(args: Array[String]): Unit = {
     // Set the configuration file's path
-    val configFilePath = fileServicePath
+    val configFilePath = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("file-service")
       .resolve("src")
       .resolve("main")
       .resolve("resources")
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/FileServiceConfiguration.scala b/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
similarity index 96%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/FileServiceConfiguration.scala
rename to file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
index 8263d6445df..8b36a1a0631 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/FileServiceConfiguration.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import io.dropwizard.core.Configuration
 
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/DatasetAccessResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
similarity index 90%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/DatasetAccessResource.scala
rename to file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
index d13e7591e38..4698c7d77c2 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/DatasetAccessResource.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
@@ -17,26 +17,26 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
-
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.dao.jooq.generated.Tables.USER
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{DatasetDao, DatasetUserAccessDao, UserDao}
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{DatasetUserAccess, User}
-import edu.uci.ics.texera.service.resource.DatasetAccessResource.{
+package org.apache.texera.service.resource
+
+import io.dropwizard.auth.Auth
+import jakarta.annotation.security.RolesAllowed
+import jakarta.ws.rs.core.{MediaType, Response}
+import jakarta.ws.rs._
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.Tables.USER
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS
+import org.apache.texera.dao.jooq.generated.tables.daos.{DatasetDao, DatasetUserAccessDao, UserDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{DatasetUserAccess, User}
+import org.apache.texera.service.resource.DatasetAccessResource.{
   AccessEntry,
   context,
   getOwner,
   userHasWriteAccess
 }
-import io.dropwizard.auth.Auth
-import jakarta.annotation.security.RolesAllowed
-import jakarta.ws.rs.{DELETE, GET, PUT, Path, PathParam, Produces}
-import jakarta.ws.rs.core.{MediaType, Response}
 import org.jooq.{DSLContext, EnumType}
 
 import javax.ws.rs.ForbiddenException
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/DatasetResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
similarity index 67%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/DatasetResource.scala
rename to file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
index 97f2209bec0..44ce22dfb1d 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/resource/DatasetResource.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
@@ -17,73 +17,62 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
-
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.core.storage.model.OnDataset
-import edu.uci.ics.amber.core.storage.util.LakeFSStorageClient
-import edu.uci.ics.amber.core.storage.{DocumentFactory, FileResolver}
-import edu.uci.ics.texera.auth.SessionUser
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.dao.SqlServer.withTransaction
-import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum
-import edu.uci.ics.texera.dao.jooq.generated.tables.User.USER
-import edu.uci.ics.texera.dao.jooq.generated.tables.Dataset.DATASET
-import edu.uci.ics.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS
-import edu.uci.ics.texera.dao.jooq.generated.tables.DatasetVersion.DATASET_VERSION
-import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
+package org.apache.texera.service.resource
+
+import io.dropwizard.auth.Auth
+import jakarta.annotation.security.RolesAllowed
+import jakarta.ws.rs._
+import jakarta.ws.rs.core._
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.core.storage.model.OnDataset
+import org.apache.texera.amber.core.storage.util.LakeFSStorageClient
+import org.apache.texera.amber.core.storage.{DocumentFactory, FileResolver}
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.dao.SqlServer.withTransaction
+import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
+import org.apache.texera.dao.jooq.generated.tables.Dataset.DATASET
+import org.apache.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS
+import org.apache.texera.dao.jooq.generated.tables.DatasetVersion.DATASET_VERSION
+import org.apache.texera.dao.jooq.generated.tables.User.USER
+import org.apache.texera.dao.jooq.generated.tables.daos.{
   DatasetDao,
   DatasetUserAccessDao,
   DatasetVersionDao
 }
-import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{
+import org.apache.texera.dao.jooq.generated.tables.pojos.{
   Dataset,
   DatasetUserAccess,
   DatasetVersion
 }
-import edu.uci.ics.texera.service.`type`.DatasetFileNode
-import edu.uci.ics.texera.service.resource.DatasetAccessResource.{
-  getDatasetUserAccessPrivilege,
-  getOwner,
-  isDatasetPublic,
-  userHasReadAccess,
-  userHasWriteAccess,
-  userOwnDataset
-}
-import edu.uci.ics.texera.service.resource.DatasetResource.{
-  CreateDatasetRequest,
-  DashboardDataset,
-  DashboardDatasetVersion,
-  DatasetDescriptionModification,
-  DatasetVersionRootFileNodesResponse,
-  Diff,
-  context,
-  getDatasetByID,
-  getDatasetVersionByID,
-  getLatestDatasetVersion,
-  put
-}
-import edu.uci.ics.texera.service.util.S3StorageClient
-import edu.uci.ics.texera.service.util.S3StorageClient.{
+import org.apache.texera.service.`type`.DatasetFileNode
+import org.apache.texera.service.resource.DatasetAccessResource._
+import org.apache.texera.service.resource.DatasetResource.{context, _}
+import org.apache.texera.service.util.S3StorageClient
+import org.apache.texera.service.util.S3StorageClient.{
   MAXIMUM_NUM_OF_MULTIPART_S3_PARTS,
   MINIMUM_NUM_OF_MULTIPART_S3_PART
 }
-import io.dropwizard.auth.Auth
-import jakarta.annotation.security.RolesAllowed
-import jakarta.ws.rs._
-import jakarta.ws.rs.core.{Context, HttpHeaders, MediaType, Response, StreamingOutput}
 import org.jooq.{DSLContext, EnumType}
-
-import java.util
+import org.jooq.impl.DSL
+import org.jooq.impl.DSL.{inline => inl}
 import java.io.{InputStream, OutputStream}
 import java.net.{HttpURLConnection, URL, URLDecoder}
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Paths}
+import java.util
 import java.util.Optional
 import java.util.zip.{ZipEntry, ZipOutputStream}
 import scala.collection.mutable.ListBuffer
 import scala.jdk.CollectionConverters._
 import scala.jdk.OptionConverters._
+import org.apache.texera.dao.jooq.generated.tables.DatasetUploadSession.DATASET_UPLOAD_SESSION
+import org.apache.texera.dao.jooq.generated.tables.DatasetUploadSessionPart.DATASET_UPLOAD_SESSION_PART
+import org.jooq.exception.DataAccessException
+import software.amazon.awssdk.services.s3.model.UploadPartResponse
+
+import java.sql.SQLException
+import scala.util.Try
 
 object DatasetResource {
 
@@ -108,11 +97,11 @@ object DatasetResource {
     */
   private def put(buf: Array[Byte], len: Int, url: String, partNum: Int): String = {
     val conn = new URL(url).openConnection().asInstanceOf[HttpURLConnection]
-    conn.setDoOutput(true);
+    conn.setDoOutput(true)
     conn.setRequestMethod("PUT")
     conn.setFixedLengthStreamingMode(len)
     val out = conn.getOutputStream
-    out.write(buf, 0, len);
+    out.write(buf, 0, len)
     out.close()
 
     val code = conn.getResponseCode
@@ -306,16 +295,7 @@ class DatasetResource {
       datasetUserAccessDao.insert(datasetUserAccess)
 
       DashboardDataset(
-        new Dataset(
-          createdDataset.getDid,
-          createdDataset.getOwnerUid,
-          createdDataset.getName,
-          createdDataset.getRepositoryName,
-          createdDataset.getIsPublic,
-          createdDataset.getIsDownloadable,
-          createdDataset.getDescription,
-          createdDataset.getCreationTime
-        ),
+        createdDataset.into(classOf[Dataset]),
         user.getEmail,
         PrivilegeEnum.WRITE,
         isOwner = true,
@@ -429,7 +409,6 @@ class DatasetResource {
             e
           )
       }
-
       // delete the directory on S3
       if (
         S3StorageClient.directoryExists(StorageConfig.lakefsBucketName, dataset.getRepositoryName)
@@ -667,138 +646,173 @@ class DatasetResource {
       @QueryParam("type") operationType: String,
       @QueryParam("ownerEmail") ownerEmail: String,
       @QueryParam("datasetName") datasetName: String,
-      @QueryParam("filePath") encodedUrl: String,
-      @QueryParam("uploadId") uploadId: Optional[String],
+      @QueryParam("filePath") filePath: String,
       @QueryParam("numParts") numParts: Optional[Integer],
-      payload: Map[
-        String,
-        Any
-      ], // Expecting {"parts": [...], "physicalAddress": "s3://bucket/path"}
       @Auth user: SessionUser
   ): Response = {
     val uid = user.getUid
+    val dataset: Dataset = getDatasetBy(ownerEmail, datasetName)
+
+    operationType.toLowerCase match {
+      case "init"   => initMultipartUpload(dataset.getDid, filePath, numParts, uid)
+      case "finish" => finishMultipartUpload(dataset.getDid, filePath, uid)
+      case "abort"  => abortMultipartUpload(dataset.getDid, filePath, uid)
+      case _ =>
+        throw new BadRequestException("Invalid type parameter. Use 'init', 'finish', or 'abort'.")
+    }
+  }
 
-    withTransaction(context) { ctx =>
-      val dataset = context
-        .select(DATASET.fields: _*)
-        .from(DATASET)
-        .leftJoin(USER)
-        .on(USER.UID.eq(DATASET.OWNER_UID))
-        .where(USER.EMAIL.eq(ownerEmail))
-        .and(DATASET.NAME.eq(datasetName))
-        .fetchOneInto(classOf[Dataset])
-      if (dataset == null || !userHasWriteAccess(ctx, dataset.getDid, uid)) {
-        throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE)
-      }
+  @POST
+  @RolesAllowed(Array("REGULAR", "ADMIN"))
+  @Consumes(Array(MediaType.APPLICATION_OCTET_STREAM))
+  @Path("/multipart-upload/part")
+  def uploadPart(
+      @QueryParam("ownerEmail") datasetOwnerEmail: String,
+      @QueryParam("datasetName") datasetName: String,
+      @QueryParam("filePath") encodedFilePath: String,
+      @QueryParam("partNumber") partNumber: Int,
+      partStream: InputStream,
+      @Context headers: HttpHeaders,
+      @Auth user: SessionUser
+  ): Response = {
 
-      // Decode the file path
-      val repositoryName = dataset.getRepositoryName
-      val filePath = URLDecoder.decode(encodedUrl, StandardCharsets.UTF_8.name())
+    val uid = user.getUid
+    val dataset: Dataset = getDatasetBy(datasetOwnerEmail, datasetName)
+    val did = dataset.getDid
 
-      operationType.toLowerCase match {
-        case "init" =>
-          val numPartsValue = numParts.toScala.getOrElse(
-            throw new BadRequestException("numParts is required for initialization")
-          )
+    if (encodedFilePath == null || encodedFilePath.isEmpty)
+      throw new BadRequestException("filePath is required")
+    if (partNumber < 1)
+      throw new BadRequestException("partNumber must be >= 1")
 
-          val presignedResponse = LakeFSStorageClient.initiatePresignedMultipartUploads(
-            repositoryName,
-            filePath,
-            numPartsValue
-          )
-          Response
-            .ok(
-              Map(
-                "uploadId" -> presignedResponse.getUploadId,
-                "presignedUrls" -> presignedResponse.getPresignedUrls,
-                "physicalAddress" -> presignedResponse.getPhysicalAddress
-              )
-            )
-            .build()
+    val filePath = validateAndNormalizeFilePathOrThrow(
+      URLDecoder.decode(encodedFilePath, StandardCharsets.UTF_8.name())
+    )
 
-        case "finish" =>
-          val uploadIdValue = uploadId.toScala.getOrElse(
-            throw new BadRequestException("uploadId is required for completion")
-          )
+    val contentLength =
+      Option(headers.getHeaderString(HttpHeaders.CONTENT_LENGTH))
+        .map(_.trim)
+        .flatMap(s => Try(s.toLong).toOption)
+        .filter(_ > 0)
+        .getOrElse {
+          throw new BadRequestException("Invalid/Missing Content-Length")
+        }
 
-          // Extract parts from the payload
-          val partsList = payload.get("parts") match {
-            case Some(rawList: List[_]) =>
-              try {
-                rawList.map {
-                  case part: Map[_, _] =>
-                    val partMap = part.asInstanceOf[Map[String, Any]]
-                    val partNumber = partMap.get("PartNumber") match {
-                      case Some(i: Int)    => i
-                      case Some(s: String) => s.toInt
-                      case _               => throw new BadRequestException("Invalid or missing PartNumber")
-                    }
-                    val eTag = partMap.get("ETag") match {
-                      case Some(s: String) => s
-                      case _               => throw new BadRequestException("Invalid or missing ETag")
-                    }
-                    (partNumber, eTag)
-
-                  case _ =>
-                    throw new BadRequestException("Each part must be a Map[String, Any]")
-                }
-              } catch {
-                case e: NumberFormatException =>
-                  throw new BadRequestException("PartNumber must be an integer", e)
-              }
-
-            case _ =>
-              throw new BadRequestException("Missing or invalid 'parts' list in payload")
-          }
+    withTransaction(context) { ctx =>
+      if (!userHasWriteAccess(ctx, did, uid))
+        throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE)
 
-          // Extract physical address from payload
-          val physicalAddress = payload.get("physicalAddress") match {
-            case Some(address: String) => address
-            case _                     => throw new BadRequestException("Missing physicalAddress in payload")
-          }
+      val session = ctx
+        .selectFrom(DATASET_UPLOAD_SESSION)
+        .where(
+          DATASET_UPLOAD_SESSION.UID
+            .eq(uid)
+            .and(DATASET_UPLOAD_SESSION.DID.eq(did))
+            .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+        )
+        .fetchOne()
 
-          // Complete the multipart upload with parts and physical address
-          val objectStats = LakeFSStorageClient.completePresignedMultipartUploads(
-            repositoryName,
-            filePath,
-            uploadIdValue,
-            partsList,
-            physicalAddress
-          )
+      if (session == null)
+        throw new NotFoundException("Upload session not found. Call type=init first.")
 
-          Response
-            .ok(
-              Map(
-                "message" -> "Multipart upload completed successfully",
-                "filePath" -> objectStats.getPath
-              )
+      val expectedParts = session.getNumPartsRequested
+      if (partNumber > expectedParts) {
+        throw new BadRequestException(
+          s"$partNumber exceeds the requested parts on init: $expectedParts"
+        )
+      }
+
+      if (partNumber < expectedParts && contentLength < MINIMUM_NUM_OF_MULTIPART_S3_PART) {
+        throw new BadRequestException(
+          s"Part $partNumber is too small ($contentLength bytes). " +
+            s"All non-final parts must be >= $MINIMUM_NUM_OF_MULTIPART_S3_PART bytes."
+        )
+      }
+
+      val physicalAddr = Option(session.getPhysicalAddress).map(_.trim).getOrElse("")
+      if (physicalAddr.isEmpty) {
+        throw new WebApplicationException(
+          "Upload session is missing physicalAddress. Re-init the upload.",
+          Response.Status.INTERNAL_SERVER_ERROR
+        )
+      }
+
+      val uploadId = session.getUploadId
+      val (bucket, key) =
+        try LakeFSStorageClient.parsePhysicalAddress(physicalAddr)
+        catch {
+          case e: IllegalArgumentException =>
+            throw new WebApplicationException(
+              s"Upload session has invalid physicalAddress. Re-init the upload. (${e.getMessage})",
+              Response.Status.INTERNAL_SERVER_ERROR
             )
-            .build()
+        }
 
-        case "abort" =>
-          val uploadIdValue = uploadId.toScala.getOrElse(
-            throw new BadRequestException("uploadId is required for abortion")
-          )
+      // Per-part lock: if another request is streaming the same part, fail fast.
+      val partRow =
+        try {
+          ctx
+            .selectFrom(DATASET_UPLOAD_SESSION_PART)
+            .where(
+              DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+                .eq(uploadId)
+                .and(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.eq(partNumber))
+            )
+            .forUpdate()
+            .noWait()
+            .fetchOne()
+        } catch {
+          case e: DataAccessException
+              if Option(e.getCause)
+                .collect { case s: SQLException => s.getSQLState }
+                .contains("55P03") =>
+            throw new WebApplicationException(
+              s"Part $partNumber is already being uploaded",
+              Response.Status.CONFLICT
+            )
+        }
 
-          // Extract physical address from payload
-          val physicalAddress = payload.get("physicalAddress") match {
-            case Some(address: String) => address
-            case _                     => throw new BadRequestException("Missing physicalAddress in payload")
-          }
+      if (partRow == null) {
+        // Should not happen if init pre-created rows
+        throw new WebApplicationException(
+          s"Part row not initialized for part $partNumber. Re-init the upload.",
+          Response.Status.INTERNAL_SERVER_ERROR
+        )
+      }
 
-          // Abort the multipart upload
-          LakeFSStorageClient.abortPresignedMultipartUploads(
-            repositoryName,
-            filePath,
-            uploadIdValue,
-            physicalAddress
+      // Idempotency: if ETag already set, accept the retry quickly.
+      val existing = Option(partRow.getEtag).map(_.trim).getOrElse("")
+      if (existing.isEmpty) {
+        // Stream to S3 while holding the part lock (prevents concurrent streams for same part)
+        val response: UploadPartResponse =
+          S3StorageClient.uploadPartWithRequest(
+            bucket = bucket,
+            key = key,
+            uploadId = uploadId,
+            partNumber = partNumber,
+            inputStream = partStream,
+            contentLength = Some(contentLength)
           )
 
-          Response.ok(Map("message" -> "Multipart upload aborted successfully")).build()
+        val etagClean = Option(response.eTag()).map(_.replace("\"", "")).map(_.trim).getOrElse("")
+        if (etagClean.isEmpty) {
+          throw new WebApplicationException(
+            s"Missing ETag returned from S3 for part $partNumber",
+            Response.Status.INTERNAL_SERVER_ERROR
+          )
+        }
 
-        case _ =>
-          throw new BadRequestException("Invalid type parameter. Use 'init', 'finish', or 'abort'.")
+        ctx
+          .update(DATASET_UPLOAD_SESSION_PART)
+          .set(DATASET_UPLOAD_SESSION_PART.ETAG, etagClean)
+          .where(
+            DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+              .eq(uploadId)
+              .and(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.eq(partNumber))
+          )
+          .execute()
       }
+      Response.ok().build()
     }
   }
 
@@ -1042,9 +1056,8 @@ class DatasetResource {
       val ownerNode = DatasetFileNode
         .fromLakeFSRepositoryCommittedObjects(
           Map(
-            (user.getEmail, dataset.getName, latestVersion.getName) ->
-              LakeFSStorageClient
-                .retrieveObjectsOfVersion(dataset.getRepositoryName, latestVersion.getVersionHash)
+            (user.getEmail, dataset.getName, latestVersion.getName) -> LakeFSStorageClient
+              .retrieveObjectsOfVersion(dataset.getRepositoryName, latestVersion.getVersionHash)
           )
         )
         .head
@@ -1184,52 +1197,6 @@ class DatasetResource {
     withTransaction(context)(ctx => getDashboardDataset(ctx, did, None))
   }
 
-  @GET
-  @Path("/file")
-  def retrieveDatasetSingleFile(
-      @QueryParam("path") pathStr: String
-  ): Response = {
-    val decodedPathStr = URLDecoder.decode(pathStr, StandardCharsets.UTF_8.name())
-
-    withTransaction(context)(_ => {
-      val fileUri = FileResolver.resolve(decodedPathStr)
-      val streamingOutput = new StreamingOutput() {
-        override def write(output: OutputStream): Unit = {
-          val inputStream = DocumentFactory.openReadonlyDocument(fileUri).asInputStream()
-          try {
-            val buffer = new Array[Byte](8192) // buffer size
-            var bytesRead = inputStream.read(buffer)
-            while (bytesRead != -1) {
-              output.write(buffer, 0, bytesRead)
-              bytesRead = inputStream.read(buffer)
-            }
-          } finally {
-            inputStream.close()
-          }
-        }
-      }
-
-      val contentType = decodedPathStr.split("\\.").lastOption.map(_.toLowerCase) match {
-        case Some("jpg") | Some("jpeg") => "image/jpeg"
-        case Some("png")                => "image/png"
-        case Some("csv")                => "text/csv"
-        case Some("md")                 => "text/markdown"
-        case Some("txt")                => "text/plain"
-        case Some("html") | Some("htm") => "text/html"
-        case Some("json")               => "application/json"
-        case Some("pdf")                => "application/pdf"
-        case Some("doc") | Some("docx") => "application/msword"
-        case Some("xls") | Some("xlsx") => "application/vnd.ms-excel"
-        case Some("ppt") | Some("pptx") => "application/vnd.ms-powerpoint"
-        case Some("mp4")                => "video/mp4"
-        case Some("mp3")                => "audio/mpeg"
-        case _                          => "application/octet-stream" // default binary format
-      }
-
-      Response.ok(streamingOutput).`type`(contentType).build()
-    })
-  }
-
   /**
     * This method returns all owner user names of the dataset that the user has access to
     *
@@ -1400,4 +1367,379 @@ class DatasetResource {
         Right(response)
     }
   }
+
+  // === Multipart helpers ===
+
+  private def getDatasetBy(ownerEmail: String, datasetName: String) = {
+    val dataset = context
+      .select(DATASET.fields: _*)
+      .from(DATASET)
+      .leftJoin(USER)
+      .on(USER.UID.eq(DATASET.OWNER_UID))
+      .where(USER.EMAIL.eq(ownerEmail))
+      .and(DATASET.NAME.eq(datasetName))
+      .fetchOneInto(classOf[Dataset])
+    if (dataset == null) {
+      throw new BadRequestException("Dataset not found")
+    }
+    dataset
+  }
+
+  private def validateAndNormalizeFilePathOrThrow(filePath: String): String = {
+    val path = Option(filePath).getOrElse("").replace("\\", "/")
+    if (
+      path.isEmpty ||
+      path.startsWith("/") ||
+      path.split("/").exists(seg => seg == "." || seg == "..") ||
+      path.exists(ch => ch == 0.toChar || ch < 0x20.toChar || ch == 0x7f.toChar)
+    ) throw new BadRequestException("Invalid filePath")
+    path
+  }
+
+  private def initMultipartUpload(
+      did: Integer,
+      encodedFilePath: String,
+      numParts: Optional[Integer],
+      uid: Integer
+  ): Response = {
+
+    withTransaction(context) { ctx =>
+      if (!userHasWriteAccess(ctx, did, uid)) {
+        throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE)
+      }
+
+      val dataset = getDatasetByID(ctx, did)
+      val repositoryName = dataset.getRepositoryName
+
+      val filePath =
+        validateAndNormalizeFilePathOrThrow(
+          URLDecoder.decode(encodedFilePath, StandardCharsets.UTF_8.name())
+        )
+
+      val numPartsValue = numParts.toScala.getOrElse {
+        throw new BadRequestException("numParts is required for initialization")
+      }
+      if (numPartsValue < 1 || numPartsValue > MAXIMUM_NUM_OF_MULTIPART_S3_PARTS) {
+        throw new BadRequestException(
+          "numParts must be between 1 and " + MAXIMUM_NUM_OF_MULTIPART_S3_PARTS
+        )
+      }
+
+      // Reject if a session already exists
+      val exists = ctx.fetchExists(
+        ctx
+          .selectOne()
+          .from(DATASET_UPLOAD_SESSION)
+          .where(
+            DATASET_UPLOAD_SESSION.UID
+              .eq(uid)
+              .and(DATASET_UPLOAD_SESSION.DID.eq(did))
+              .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+          )
+      )
+      if (exists) {
+        throw new WebApplicationException(
+          "Upload already in progress for this filePath",
+          Response.Status.CONFLICT
+        )
+      }
+
+      val presign = LakeFSStorageClient.initiatePresignedMultipartUploads(
+        repositoryName,
+        filePath,
+        numPartsValue
+      )
+
+      val uploadIdStr = presign.getUploadId
+      val physicalAddr = presign.getPhysicalAddress
+
+      // If anything fails after this point, abort LakeFS multipart
+      try {
+        val rowsInserted = ctx
+          .insertInto(DATASET_UPLOAD_SESSION)
+          .set(DATASET_UPLOAD_SESSION.FILE_PATH, filePath)
+          .set(DATASET_UPLOAD_SESSION.DID, did)
+          .set(DATASET_UPLOAD_SESSION.UID, uid)
+          .set(DATASET_UPLOAD_SESSION.UPLOAD_ID, uploadIdStr)
+          .set(DATASET_UPLOAD_SESSION.PHYSICAL_ADDRESS, physicalAddr)
+          .set(DATASET_UPLOAD_SESSION.NUM_PARTS_REQUESTED, numPartsValue)
+          .onDuplicateKeyIgnore()
+          .execute()
+
+        if (rowsInserted != 1) {
+          LakeFSStorageClient.abortPresignedMultipartUploads(
+            repositoryName,
+            filePath,
+            uploadIdStr,
+            physicalAddr
+          )
+          throw new WebApplicationException(
+            "Upload already in progress for this filePath",
+            Response.Status.CONFLICT
+          )
+        }
+
+        // Pre-create part rows 1..numPartsValue with empty ETag.
+        // This makes per-part locking cheap and deterministic.
+
+        val partNumberSeries = DSL.generateSeries(1, numPartsValue).asTable("gs", "pn")
+        val partNumberField = partNumberSeries.field("pn", classOf[Integer])
+
+        ctx
+          .insertInto(
+            DATASET_UPLOAD_SESSION_PART,
+            DATASET_UPLOAD_SESSION_PART.UPLOAD_ID,
+            DATASET_UPLOAD_SESSION_PART.PART_NUMBER,
+            DATASET_UPLOAD_SESSION_PART.ETAG
+          )
+          .select(
+            ctx
+              .select(
+                inl(uploadIdStr),
+                partNumberField,
+                inl("") // placeholder empty etag
+              )
+              .from(partNumberSeries)
+          )
+          .execute()
+
+        Response.ok().build()
+      } catch {
+        case e: Exception =>
+          // rollback will remove session + parts rows; we still must abort LakeFS
+          try {
+            LakeFSStorageClient.abortPresignedMultipartUploads(
+              repositoryName,
+              filePath,
+              uploadIdStr,
+              physicalAddr
+            )
+          } catch { case _: Throwable => () }
+          throw e
+      }
+    }
+  }
+
+  private def finishMultipartUpload(
+      did: Integer,
+      encodedFilePath: String,
+      uid: Int
+  ): Response = {
+
+    val filePath = validateAndNormalizeFilePathOrThrow(
+      URLDecoder.decode(encodedFilePath, StandardCharsets.UTF_8.name())
+    )
+
+    withTransaction(context) { ctx =>
+      if (!userHasWriteAccess(ctx, did, uid)) {
+        throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE)
+      }
+
+      val dataset = getDatasetByID(ctx, did)
+
+      // Lock the session so abort/finish don't race each other
+      val session =
+        try {
+          ctx
+            .selectFrom(DATASET_UPLOAD_SESSION)
+            .where(
+              DATASET_UPLOAD_SESSION.UID
+                .eq(uid)
+                .and(DATASET_UPLOAD_SESSION.DID.eq(did))
+                .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+            )
+            .forUpdate()
+            .noWait()
+            .fetchOne()
+        } catch {
+          case e: DataAccessException
+              if Option(e.getCause)
+                .collect { case s: SQLException => s.getSQLState }
+                .contains("55P03") =>
+            throw new WebApplicationException(
+              "Upload is already being finalized/aborted",
+              Response.Status.CONFLICT
+            )
+        }
+
+      if (session == null) {
+        throw new NotFoundException("Upload session not found or already finalized")
+      }
+
+      val uploadId = session.getUploadId
+      val expectedParts = session.getNumPartsRequested
+
+      val physicalAddr = Option(session.getPhysicalAddress).map(_.trim).getOrElse("")
+      if (physicalAddr.isEmpty) {
+        throw new WebApplicationException(
+          "Upload session is missing physicalAddress. Re-init the upload.",
+          Response.Status.INTERNAL_SERVER_ERROR
+        )
+      }
+
+      val total = DSL.count()
+      val done =
+        DSL
+          .count()
+          .filterWhere(DATASET_UPLOAD_SESSION_PART.ETAG.ne(""))
+          .as("done")
+
+      val agg = ctx
+        .select(total.as("total"), done)
+        .from(DATASET_UPLOAD_SESSION_PART)
+        .where(DATASET_UPLOAD_SESSION_PART.UPLOAD_ID.eq(uploadId))
+        .fetchOne()
+
+      val totalCnt = agg.get("total", classOf[java.lang.Integer]).intValue()
+      val doneCnt = agg.get("done", classOf[java.lang.Integer]).intValue()
+
+      if (totalCnt != expectedParts) {
+        throw new WebApplicationException(
+          s"Part table mismatch: expected $expectedParts rows but found $totalCnt. Re-init the upload.",
+          Response.Status.INTERNAL_SERVER_ERROR
+        )
+      }
+
+      if (doneCnt != expectedParts) {
+        val missing = ctx
+          .select(DATASET_UPLOAD_SESSION_PART.PART_NUMBER)
+          .from(DATASET_UPLOAD_SESSION_PART)
+          .where(
+            DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+              .eq(uploadId)
+              .and(DATASET_UPLOAD_SESSION_PART.ETAG.eq(""))
+          )
+          .orderBy(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.asc())
+          .limit(50)
+          .fetch(DATASET_UPLOAD_SESSION_PART.PART_NUMBER)
+          .asScala
+          .toList
+
+        throw new WebApplicationException(
+          s"Upload incomplete. Some missing ETags for parts are: ${missing.mkString(",")}",
+          Response.Status.CONFLICT
+        )
+      }
+
+      // Build partsList in order
+      val partsList: List[(Int, String)] =
+        ctx
+          .select(DATASET_UPLOAD_SESSION_PART.PART_NUMBER, DATASET_UPLOAD_SESSION_PART.ETAG)
+          .from(DATASET_UPLOAD_SESSION_PART)
+          .where(DATASET_UPLOAD_SESSION_PART.UPLOAD_ID.eq(uploadId))
+          .orderBy(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.asc())
+          .fetch()
+          .asScala
+          .map(r =>
+            (
+              r.get(DATASET_UPLOAD_SESSION_PART.PART_NUMBER).intValue(),
+              r.get(DATASET_UPLOAD_SESSION_PART.ETAG)
+            )
+          )
+          .toList
+
+      val objectStats = LakeFSStorageClient.completePresignedMultipartUploads(
+        dataset.getRepositoryName,
+        filePath,
+        uploadId,
+        partsList,
+        physicalAddr
+      )
+
+      // Cleanup: delete the session; parts are removed by ON DELETE CASCADE
+      ctx
+        .deleteFrom(DATASET_UPLOAD_SESSION)
+        .where(
+          DATASET_UPLOAD_SESSION.UID
+            .eq(uid)
+            .and(DATASET_UPLOAD_SESSION.DID.eq(did))
+            .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+        )
+        .execute()
+
+      Response
+        .ok(
+          Map(
+            "message" -> "Multipart upload completed successfully",
+            "filePath" -> objectStats.getPath
+          )
+        )
+        .build()
+    }
+  }
+
+  private def abortMultipartUpload(
+      did: Integer,
+      encodedFilePath: String,
+      uid: Int
+  ): Response = {
+
+    val filePath = validateAndNormalizeFilePathOrThrow(
+      URLDecoder.decode(encodedFilePath, StandardCharsets.UTF_8.name())
+    )
+
+    withTransaction(context) { ctx =>
+      if (!userHasWriteAccess(ctx, did, uid)) {
+        throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE)
+      }
+
+      val dataset = getDatasetByID(ctx, did)
+
+      val session =
+        try {
+          ctx
+            .selectFrom(DATASET_UPLOAD_SESSION)
+            .where(
+              DATASET_UPLOAD_SESSION.UID
+                .eq(uid)
+                .and(DATASET_UPLOAD_SESSION.DID.eq(did))
+                .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+            )
+            .forUpdate()
+            .noWait()
+            .fetchOne()
+        } catch {
+          case e: DataAccessException
+              if Option(e.getCause)
+                .collect { case s: SQLException => s.getSQLState }
+                .contains("55P03") =>
+            throw new WebApplicationException(
+              "Upload is already being finalized/aborted",
+              Response.Status.CONFLICT
+            )
+        }
+
+      if (session == null) {
+        throw new NotFoundException("Upload session not found or already finalized")
+      }
+
+      val physicalAddr = Option(session.getPhysicalAddress).map(_.trim).getOrElse("")
+      if (physicalAddr.isEmpty) {
+        throw new WebApplicationException(
+          "Upload session is missing physicalAddress. Re-init the upload.",
+          Response.Status.INTERNAL_SERVER_ERROR
+        )
+      }
+
+      LakeFSStorageClient.abortPresignedMultipartUploads(
+        dataset.getRepositoryName,
+        filePath,
+        session.getUploadId,
+        physicalAddr
+      )
+
+      // Delete session; parts removed via ON DELETE CASCADE
+      ctx
+        .deleteFrom(DATASET_UPLOAD_SESSION)
+        .where(
+          DATASET_UPLOAD_SESSION.UID
+            .eq(uid)
+            .and(DATASET_UPLOAD_SESSION.DID.eq(did))
+            .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+        )
+        .execute()
+
+      Response.ok(Map("message" -> "Multipart upload aborted successfully")).build()
+    }
+  }
 }
diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 96%
rename from core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
rename to file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
index 895f6a400af..08ecd1cd0cb 100644
--- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/HealthCheckResource.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
 import jakarta.ws.rs.core.MediaType
 import jakarta.ws.rs.{GET, Path, Produces}
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/type/dataset/DatasetFileNode.scala b/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
similarity index 98%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/type/dataset/DatasetFileNode.scala
rename to file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
index 9abfb42f248..7c91d30b94a 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/type/dataset/DatasetFileNode.scala
+++ b/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.`type`
+package org.apache.texera.service.`type`
 
-import edu.uci.ics.amber.core.storage.util.dataset.PhysicalFileNode
 import io.lakefs.clients.sdk.model.ObjectStats
+import org.apache.texera.amber.core.storage.util.dataset.PhysicalFileNode
 
 import java.util
 import scala.collection.mutable
diff --git a/core/file-service/src/main/scala/edu/uci/ics/texera/service/type/serde/DatasetFileNodeSerializer.java b/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
similarity index 95%
rename from core/file-service/src/main/scala/edu/uci/ics/texera/service/type/serde/DatasetFileNodeSerializer.java
rename to file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
index c568c24258e..d0731fdec71 100644
--- a/core/file-service/src/main/scala/edu/uci/ics/texera/service/type/serde/DatasetFileNodeSerializer.java
+++ b/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.type.serde;
+package org.apache.texera.service.type.serde;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import edu.uci.ics.texera.service.type.DatasetFileNode;
+import org.apache.texera.service.type.DatasetFileNode;
 import scala.collection.JavaConverters;
 import scala.collection.immutable.List;
 
diff --git a/core/file-service/src/test/scala/edu/uci/ics/texera/service/MockLakeFS.scala b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
similarity index 64%
rename from core/file-service/src/test/scala/edu/uci/ics/texera/service/MockLakeFS.scala
rename to file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
index 77560bbfd44..10c68bd0858 100644
--- a/core/file-service/src/test/scala/edu/uci/ics/texera/service/MockLakeFS.scala
+++ b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
@@ -17,20 +17,21 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
-
-import com.dimafeng.testcontainers.{
-  ForAllTestContainer,
-  GenericContainer,
-  PostgreSQLContainer,
-  MinIOContainer,
-  MultipleContainers
-}
+package org.apache.texera.service
+
+import com.dimafeng.testcontainers._
+import io.lakefs.clients.sdk.{ApiClient, RepositoriesApi}
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.service.util.S3StorageClient
 import org.scalatest.{BeforeAndAfterAll, Suite}
 import org.testcontainers.containers.Network
 import org.testcontainers.utility.DockerImageName
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.texera.service.util.S3StorageClient
+import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider}
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.s3.S3Client
+import software.amazon.awssdk.services.s3.S3Configuration
+
+import java.net.URI
 
 /**
   * Trait to spin up a LakeFS + MinIO + Postgres stack using Testcontainers,
@@ -64,9 +65,14 @@ trait MockLakeFS extends ForAllTestContainer with BeforeAndAfterAll { self: Suit
     s"postgresql://${postgres.username}:${postgres.password}" +
       s"@${postgres.container.getNetworkAliases.get(0)}:5432/${postgres.databaseName}" +
       s"?sslmode=disable"
+
   val lakefsUsername = "texera-admin"
+
+  // These are the API credentials created/used during setup.
+  // In lakeFS, the access key + secret key are used as basic-auth username/password for the API.
   val lakefsAccessKeyID = "AKIAIOSFOLKFSSAMPLES"
   val lakefsSecretAccessKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
+
   val lakefs = GenericContainer(
     dockerImage = "treeverse/lakefs:1.51",
     exposedPorts = Seq(8000),
@@ -93,11 +99,45 @@ trait MockLakeFS extends ForAllTestContainer with BeforeAndAfterAll { self: Suit
 
   def lakefsBaseUrl: String = s"http://${lakefs.host}:${lakefs.mappedPort(8000)}"
   def minioEndpoint: String = s"http://${minio.host}:${minio.mappedPort(9000)}"
+  def lakefsApiBasePath: String = s"$lakefsBaseUrl/api/v1"
+
+  // ---- Clients (lazy so they initialize after containers are started) ----
+
+  lazy val lakefsApiClient: ApiClient = {
+    val apiClient = new ApiClient()
+    apiClient.setBasePath(lakefsApiBasePath)
+    // basic-auth for lakeFS API uses accessKey as username, secretKey as password
+    apiClient.setUsername(lakefsAccessKeyID)
+    apiClient.setPassword(lakefsSecretAccessKey)
+    apiClient
+  }
+
+  lazy val repositoriesApi: RepositoriesApi = new RepositoriesApi(lakefsApiClient)
+
+  /**
+    * S3 client instance for testing pointed at MinIO.
+    *
+    * Notes:
+    * - Region can be any value for MinIO, but MUST match what your signing expects.
+    *   so we use that.
+    * - Path-style is important: http://host:port/bucket/key
+    */
+  lazy val s3Client: S3Client = {
+    //Temporal credentials for testing purposes only
+    val creds = AwsBasicCredentials.create("texera_minio", "password")
+    S3Client
+      .builder()
+      .endpointOverride(URI.create(StorageConfig.s3Endpoint)) // set in afterStart()
+      .region(Region.US_WEST_2) // Required for `.build()`; not important in this test config.
+      .credentialsProvider(StaticCredentialsProvider.create(creds))
+      .serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build())
+      .build()
+  }
 
   override def afterStart(): Unit = {
     super.afterStart()
 
-    // setup LakeFS
+    // setup LakeFS (idempotent-ish, but will fail if it truly cannot run)
     val lakefsSetupResult = lakefs.container.execInContainer(
       "lakefs",
       "setup",
@@ -109,16 +149,14 @@ trait MockLakeFS extends ForAllTestContainer with BeforeAndAfterAll { self: Suit
       lakefsSecretAccessKey
     )
     if (lakefsSetupResult.getExitCode != 0) {
-      throw new RuntimeException(
-        s"Failed to setup LakeFS: ${lakefsSetupResult.getStderr}"
-      )
+      throw new RuntimeException(s"Failed to setup LakeFS: ${lakefsSetupResult.getStderr}")
     }
 
     // replace storage endpoints in StorageConfig
     StorageConfig.s3Endpoint = minioEndpoint
-    StorageConfig.lakefsEndpoint = s"$lakefsBaseUrl/api/v1"
+    StorageConfig.lakefsEndpoint = lakefsApiBasePath
 
-    // create S3 bucket
+    // create S3 bucket used by lakeFS in tests
     S3StorageClient.createBucketIfNotExist(StorageConfig.lakefsBucketName)
   }
 }
diff --git a/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala b/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
new file mode 100644
index 00000000000..3f72c574861
--- /dev/null
+++ b/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
@@ -0,0 +1,1331 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.resource
+
+import ch.qos.logback.classic.{Level, Logger}
+import io.lakefs.clients.sdk.ApiException
+import jakarta.ws.rs._
+import jakarta.ws.rs.core.{Cookie, HttpHeaders, MediaType, MultivaluedHashMap, Response}
+import org.apache.texera.amber.core.storage.util.LakeFSStorageClient
+import org.apache.texera.auth.SessionUser
+import org.apache.texera.dao.MockTexeraDB
+import org.apache.texera.dao.jooq.generated.enums.{PrivilegeEnum, UserRoleEnum}
+import org.apache.texera.dao.jooq.generated.tables.DatasetUploadSession.DATASET_UPLOAD_SESSION
+import org.apache.texera.dao.jooq.generated.tables.DatasetUploadSessionPart.DATASET_UPLOAD_SESSION_PART
+import org.apache.texera.dao.jooq.generated.tables.daos.{DatasetDao, UserDao}
+import org.apache.texera.dao.jooq.generated.tables.pojos.{Dataset, User}
+import org.apache.texera.service.MockLakeFS
+import org.jooq.SQLDialect
+import org.jooq.impl.DSL
+import org.scalatest.tagobjects.Slow
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Tag}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.slf4j.LoggerFactory
+
+import java.io.{ByteArrayInputStream, IOException, InputStream}
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
+import java.nio.file.{Files, Paths}
+import java.security.MessageDigest
+import java.util.concurrent.CyclicBarrier
+import java.util.{Collections, Date, Locale, Optional}
+import scala.concurrent.duration._
+import scala.concurrent.{Await, ExecutionContext, Future}
+import scala.jdk.CollectionConverters._
+import scala.util.Random
+
+object StressMultipart extends Tag("org.apache.texera.stress.multipart")
+
+class DatasetResourceSpec
+    extends AnyFlatSpec
+    with Matchers
+    with MockTexeraDB
+    with MockLakeFS
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach {
+
+  // ---------- logging (multipart tests can be noisy) ----------
+  private var savedLevels: Map[String, Level] = Map.empty
+
+  private def setLoggerLevel(loggerName: String, newLevel: Level): Level = {
+    val logger = LoggerFactory.getLogger(loggerName).asInstanceOf[Logger]
+    val prev = logger.getLevel
+    logger.setLevel(newLevel)
+    prev
+  }
+
+  // ---------- execution context (multipart race tests) ----------
+  private implicit val ec: ExecutionContext = ExecutionContext.global
+
+  // ---------------------------------------------------------------------------
+  // Shared fixtures (DatasetResource basic tests)
+  // ---------------------------------------------------------------------------
+  private val ownerUser: User = {
+    val user = new User
+    user.setName("test_user")
+    user.setPassword("123")
+    user.setEmail("test_user@test.com")
+    user.setRole(UserRoleEnum.ADMIN)
+    user
+  }
+
+  private val otherAdminUser: User = {
+    val user = new User
+    user.setName("test_user2")
+    user.setPassword("123")
+    user.setEmail("test_user2@test.com")
+    user.setRole(UserRoleEnum.ADMIN)
+    user
+  }
+
+  // REGULAR user used specifically for multipart "no WRITE access" tests.
+  private val multipartNoWriteUser: User = {
+    val user = new User
+    user.setName("multipart_user2")
+    user.setPassword("123")
+    user.setEmail("multipart_user2@test.com")
+    user.setRole(UserRoleEnum.REGULAR)
+    user
+  }
+
+  private val baseDataset: Dataset = {
+    val dataset = new Dataset
+    dataset.setName("test-dataset")
+    dataset.setRepositoryName("test-dataset")
+    dataset.setIsPublic(true)
+    dataset.setIsDownloadable(true)
+    dataset.setDescription("dataset for test")
+    dataset
+  }
+
+  // ---------------------------------------------------------------------------
+  // Multipart fixtures
+  // ---------------------------------------------------------------------------
+  private val multipartRepoName: String =
+    s"multipart-ds-${System.nanoTime()}-${Random.alphanumeric.take(6).mkString.toLowerCase}"
+
+  private val multipartDataset: Dataset = {
+    val dataset = new Dataset
+    dataset.setName("multipart-ds")
+    dataset.setRepositoryName(multipartRepoName)
+    dataset.setIsPublic(true)
+    dataset.setIsDownloadable(true)
+    dataset.setDescription("dataset for multipart upload tests")
+    dataset
+  }
+
+  // ---------- DAOs / resource ----------
+  lazy val datasetDao = new DatasetDao(getDSLContext.configuration())
+  lazy val datasetResource = new DatasetResource()
+
+  // ---------- session users ----------
+  lazy val sessionUser = new SessionUser(ownerUser)
+  lazy val sessionUser2 = new SessionUser(otherAdminUser)
+
+  // Multipart callers
+  lazy val multipartOwnerSessionUser = sessionUser
+  lazy val multipartNoWriteSessionUser = new SessionUser(multipartNoWriteUser)
+
+  // ---------------------------------------------------------------------------
+  // Lifecycle
+  // ---------------------------------------------------------------------------
+  override protected def beforeAll(): Unit = {
+    super.beforeAll()
+
+    // init db
+    initializeDBAndReplaceDSLContext()
+
+    // insert users
+    val userDao = new UserDao(getDSLContext.configuration())
+    userDao.insert(ownerUser)
+    userDao.insert(otherAdminUser)
+    userDao.insert(multipartNoWriteUser)
+
+    // insert datasets (owned by ownerUser)
+    baseDataset.setOwnerUid(ownerUser.getUid)
+    multipartDataset.setOwnerUid(ownerUser.getUid)
+
+    datasetDao.insert(baseDataset)
+    datasetDao.insert(multipartDataset)
+
+    savedLevels = Map(
+      "org.apache.http.wire" -> setLoggerLevel("org.apache.http.wire", Level.WARN),
+      "org.apache.http.headers" -> setLoggerLevel("org.apache.http.headers", Level.WARN)
+    )
+  }
+
+  override protected def beforeEach(): Unit = {
+    super.beforeEach()
+
+    // Multipart repo must exist for presigned multipart init to succeed.
+    // If it already exists, ignore 409.
+    try LakeFSStorageClient.initRepo(multipartDataset.getRepositoryName)
+    catch {
+      case e: ApiException if e.getCode == 409 => // ok
+    }
+  }
+
+  override protected def afterAll(): Unit = {
+    try shutdownDB()
+    finally {
+      try savedLevels.foreach { case (name, prev) => setLoggerLevel(name, prev) } finally super
+        .afterAll()
+    }
+  }
+
+  // ===========================================================================
+  // DatasetResourceSpec (original basic tests)
+  // ===========================================================================
+  "createDataset" should "create dataset successfully if user does not have a dataset with the same name" in {
+    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
+      datasetName = "new-dataset",
+      datasetDescription = "description for new dataset",
+      isDatasetPublic = false,
+      isDatasetDownloadable = true
+    )
+
+    val createdDataset = datasetResource.createDataset(createDatasetRequest, sessionUser)
+    createdDataset.dataset.getName shouldEqual "new-dataset"
+    createdDataset.dataset.getDescription shouldEqual "description for new dataset"
+    createdDataset.dataset.getIsPublic shouldBe false
+    createdDataset.dataset.getIsDownloadable shouldBe true
+  }
+
+  it should "refuse to create dataset if user already has a dataset with the same name" in {
+    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
+      datasetName = "test-dataset",
+      datasetDescription = "description for new dataset",
+      isDatasetPublic = false,
+      isDatasetDownloadable = true
+    )
+
+    assertThrows[BadRequestException] {
+      datasetResource.createDataset(createDatasetRequest, sessionUser)
+    }
+  }
+
+  it should "create dataset successfully if another user has a dataset with the same name" in {
+    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
+      datasetName = "test-dataset",
+      datasetDescription = "description for new dataset",
+      isDatasetPublic = false,
+      isDatasetDownloadable = true
+    )
+
+    val createdDataset = datasetResource.createDataset(createDatasetRequest, sessionUser2)
+    createdDataset.dataset.getName shouldEqual "test-dataset"
+    createdDataset.dataset.getDescription shouldEqual "description for new dataset"
+    createdDataset.dataset.getIsPublic shouldBe false
+    createdDataset.dataset.getIsDownloadable shouldBe true
+  }
+
+  it should "return DashboardDataset with correct owner email, WRITE privilege, and isOwner=true" in {
+    val createDatasetRequest = DatasetResource.CreateDatasetRequest(
+      datasetName = "dashboard-dataset-test",
+      datasetDescription = "test for DashboardDataset properties",
+      isDatasetPublic = true,
+      isDatasetDownloadable = false
+    )
+
+    val dashboardDataset = datasetResource.createDataset(createDatasetRequest, sessionUser)
+
+    dashboardDataset.ownerEmail shouldEqual ownerUser.getEmail
+    dashboardDataset.accessPrivilege shouldEqual PrivilegeEnum.WRITE
+    dashboardDataset.isOwner shouldBe true
+    dashboardDataset.size shouldEqual 0
+
+    dashboardDataset.dataset.getName shouldEqual "dashboard-dataset-test"
+    dashboardDataset.dataset.getDescription shouldEqual "test for DashboardDataset properties"
+    dashboardDataset.dataset.getIsPublic shouldBe true
+    dashboardDataset.dataset.getIsDownloadable shouldBe false
+  }
+
+  it should "delete dataset successfully if user owns it" in {
+    val dataset = new Dataset
+    dataset.setName("delete-ds")
+    dataset.setRepositoryName("delete-ds")
+    dataset.setDescription("for delete test")
+    dataset.setOwnerUid(ownerUser.getUid)
+    dataset.setIsPublic(true)
+    dataset.setIsDownloadable(true)
+    datasetDao.insert(dataset)
+
+    LakeFSStorageClient.initRepo(dataset.getRepositoryName)
+
+    val response = datasetResource.deleteDataset(dataset.getDid, sessionUser)
+
+    response.getStatus shouldEqual 200
+    datasetDao.fetchOneByDid(dataset.getDid) shouldBe null
+  }
+
+  it should "refuse to delete dataset if not owned by user" in {
+    val dataset = new Dataset
+    dataset.setName("user1-ds")
+    dataset.setRepositoryName("user1-ds")
+    dataset.setDescription("for forbidden test")
+    dataset.setOwnerUid(ownerUser.getUid)
+    dataset.setIsPublic(true)
+    dataset.setIsDownloadable(true)
+    datasetDao.insert(dataset)
+
+    LakeFSStorageClient.initRepo(dataset.getRepositoryName)
+
+    assertThrows[ForbiddenException] {
+      datasetResource.deleteDataset(dataset.getDid, sessionUser2)
+    }
+
+    datasetDao.fetchOneByDid(dataset.getDid) should not be null
+  }
+
+  // ===========================================================================
+  // Multipart upload tests (merged in)
+  // ===========================================================================
+
+  // ---------- SHA-256 Utils ----------
+  private def sha256OfChunks(chunks: Seq[Array[Byte]]): Array[Byte] = {
+    val messageDigest = MessageDigest.getInstance("SHA-256")
+    chunks.foreach(messageDigest.update)
+    messageDigest.digest()
+  }
+
+  private def sha256OfFile(path: java.nio.file.Path): Array[Byte] = {
+    val messageDigest = MessageDigest.getInstance("SHA-256")
+    val inputStream = Files.newInputStream(path)
+    try {
+      val buffer = new Array[Byte](8192)
+      var bytesRead = inputStream.read(buffer)
+      while (bytesRead != -1) {
+        messageDigest.update(buffer, 0, bytesRead)
+        bytesRead = inputStream.read(buffer)
+      }
+      messageDigest.digest()
+    } finally inputStream.close()
+  }
+
+  // ---------- helpers ----------
+  private def urlEnc(raw: String): String =
+    URLEncoder.encode(raw, StandardCharsets.UTF_8.name())
+
+  /** Minimum part-size rule (S3-style): every part except the LAST must be >= 5 MiB. */
+  private val MinNonFinalPartBytes: Int = 5 * 1024 * 1024
+  private def minPartBytes(fillByte: Byte): Array[Byte] =
+    Array.fill[Byte](MinNonFinalPartBytes)(fillByte)
+
+  private def tinyBytes(fillByte: Byte, n: Int = 1): Array[Byte] =
+    Array.fill[Byte](n)(fillByte)
+
+  /** InputStream that behaves like a mid-flight network drop after N bytes. */
+  private def flakyStream(
+      payload: Array[Byte],
+      failAfterBytes: Int,
+      msg: String = "simulated network drop"
+  ): InputStream =
+    new InputStream {
+      private var pos = 0
+      override def read(): Int = {
+        if (pos >= failAfterBytes) throw new IOException(msg)
+        if (pos >= payload.length) return -1
+        val nextByte = payload(pos) & 0xff
+        pos += 1
+        nextByte
+      }
+    }
+
+  /** Minimal HttpHeaders impl needed by DatasetResource.uploadPart */
+  private def mkHeaders(contentLength: Long): HttpHeaders =
+    new HttpHeaders {
+      private val headers = new MultivaluedHashMap[String, String]()
+      headers.putSingle(HttpHeaders.CONTENT_LENGTH, contentLength.toString)
+
+      override def getHeaderString(name: String): String = headers.getFirst(name)
+      override def getRequestHeaders = headers
+      override def getRequestHeader(name: String) =
+        Option(headers.get(name)).getOrElse(Collections.emptyList[String]())
+
+      override def getAcceptableMediaTypes = Collections.emptyList[MediaType]()
+      override def getAcceptableLanguages = Collections.emptyList[Locale]()
+      override def getMediaType: MediaType = null
+      override def getLanguage: Locale = null
+      override def getCookies = Collections.emptyMap[String, Cookie]()
+      override def getDate: Date = null
+      override def getLength: Int = contentLength.toInt
+    }
+
+  private def mkHeadersMissingContentLength: HttpHeaders =
+    new HttpHeaders {
+      private val headers = new MultivaluedHashMap[String, String]()
+      override def getHeaderString(name: String): String = null
+      override def getRequestHeaders = headers
+      override def getRequestHeader(name: String) = Collections.emptyList[String]()
+      override def getAcceptableMediaTypes = Collections.emptyList[MediaType]()
+      override def getAcceptableLanguages = Collections.emptyList[Locale]()
+      override def getMediaType: MediaType = null
+      override def getLanguage: Locale = null
+      override def getCookies = Collections.emptyMap[String, Cookie]()
+      override def getDate: Date = null
+      override def getLength: Int = -1
+    }
+
+  private def uniqueFilePath(prefix: String): String =
+    s"$prefix/${System.nanoTime()}-${Random.alphanumeric.take(8).mkString}.bin"
+
+  private def initUpload(
+      filePath: String,
+      numParts: Int,
+      user: SessionUser = multipartOwnerSessionUser
+  ): Response =
+    datasetResource.multipartUpload(
+      "init",
+      ownerUser.getEmail,
+      multipartDataset.getName,
+      urlEnc(filePath),
+      Optional.of(numParts),
+      user
+    )
+
+  private def finishUpload(
+      filePath: String,
+      user: SessionUser = multipartOwnerSessionUser
+  ): Response =
+    datasetResource.multipartUpload(
+      "finish",
+      ownerUser.getEmail,
+      multipartDataset.getName,
+      urlEnc(filePath),
+      Optional.empty(),
+      user
+    )
+
+  private def abortUpload(
+      filePath: String,
+      user: SessionUser = multipartOwnerSessionUser
+  ): Response =
+    datasetResource.multipartUpload(
+      "abort",
+      ownerUser.getEmail,
+      multipartDataset.getName,
+      urlEnc(filePath),
+      Optional.empty(),
+      user
+    )
+
+  private def uploadPart(
+      filePath: String,
+      partNumber: Int,
+      bytes: Array[Byte],
+      user: SessionUser = multipartOwnerSessionUser,
+      contentLengthOverride: Option[Long] = None,
+      missingContentLength: Boolean = false
+  ): Response = {
+    val hdrs =
+      if (missingContentLength) mkHeadersMissingContentLength
+      else mkHeaders(contentLengthOverride.getOrElse(bytes.length.toLong))
+
+    datasetResource.uploadPart(
+      ownerUser.getEmail,
+      multipartDataset.getName,
+      urlEnc(filePath),
+      partNumber,
+      new ByteArrayInputStream(bytes),
+      hdrs,
+      user
+    )
+  }
+
+  private def uploadPartWithStream(
+      filePath: String,
+      partNumber: Int,
+      stream: InputStream,
+      contentLength: Long,
+      user: SessionUser = multipartOwnerSessionUser
+  ): Response =
+    datasetResource.uploadPart(
+      ownerUser.getEmail,
+      multipartDataset.getName,
+      urlEnc(filePath),
+      partNumber,
+      stream,
+      mkHeaders(contentLength),
+      user
+    )
+
+  private def fetchSession(filePath: String) =
+    getDSLContext
+      .selectFrom(DATASET_UPLOAD_SESSION)
+      .where(
+        DATASET_UPLOAD_SESSION.UID
+          .eq(ownerUser.getUid)
+          .and(DATASET_UPLOAD_SESSION.DID.eq(multipartDataset.getDid))
+          .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+      )
+      .fetchOne()
+
+  private def fetchPartRows(uploadId: String) =
+    getDSLContext
+      .selectFrom(DATASET_UPLOAD_SESSION_PART)
+      .where(DATASET_UPLOAD_SESSION_PART.UPLOAD_ID.eq(uploadId))
+      .fetch()
+      .asScala
+      .toList
+
+  private def fetchUploadIdOrFail(filePath: String): String = {
+    val sessionRecord = fetchSession(filePath)
+    sessionRecord should not be null
+    sessionRecord.getUploadId
+  }
+
+  private def assertPlaceholdersCreated(uploadId: String, expectedParts: Int): Unit = {
+    val rows = fetchPartRows(uploadId).sortBy(_.getPartNumber)
+    rows.size shouldEqual expectedParts
+    rows.head.getPartNumber shouldEqual 1
+    rows.last.getPartNumber shouldEqual expectedParts
+    rows.foreach { r =>
+      r.getEtag should not be null
+      r.getEtag shouldEqual "" // placeholder convention
+    }
+  }
+
+  private def assertStatus(ex: WebApplicationException, status: Int): Unit =
+    ex.getResponse.getStatus shouldEqual status
+
+  // ---------------------------------------------------------------------------
+  // INIT TESTS
+  // ---------------------------------------------------------------------------
+  "multipart-upload?type=init" should "create an upload session row + precreate part placeholders (happy path)" in {
+    val filePath = uniqueFilePath("init-happy")
+    val resp = initUpload(filePath, numParts = 3)
+
+    resp.getStatus shouldEqual 200
+
+    val sessionRecord = fetchSession(filePath)
+    sessionRecord should not be null
+    sessionRecord.getNumPartsRequested shouldEqual 3
+    sessionRecord.getUploadId should not be null
+    sessionRecord.getPhysicalAddress should not be null
+
+    assertPlaceholdersCreated(sessionRecord.getUploadId, expectedParts = 3)
+  }
+
+  it should "reject missing numParts" in {
+    val filePath = uniqueFilePath("init-missing-numparts")
+    val ex = intercept[BadRequestException] {
+      datasetResource.multipartUpload(
+        "init",
+        ownerUser.getEmail,
+        multipartDataset.getName,
+        urlEnc(filePath),
+        Optional.empty(),
+        multipartOwnerSessionUser
+      )
+    }
+    assertStatus(ex, 400)
+  }
+
+  it should "reject invalid numParts (0, negative, too large)" in {
+    val filePath = uniqueFilePath("init-bad-numparts")
+    assertStatus(intercept[BadRequestException] { initUpload(filePath, 0) }, 400)
+    assertStatus(intercept[BadRequestException] { initUpload(filePath, -1) }, 400)
+    assertStatus(intercept[BadRequestException] { initUpload(filePath, 1000000000) }, 400)
+  }
+
+  it should "reject invalid filePath (empty, absolute, '.', '..', control chars)" in {
+    assertStatus(intercept[BadRequestException] { initUpload("./nope.bin", 2) }, 400)
+    assertStatus(intercept[BadRequestException] { initUpload("/absolute.bin", 2) }, 400)
+    assertStatus(intercept[BadRequestException] { initUpload("a/./b.bin", 2) }, 400)
+
+    assertStatus(intercept[BadRequestException] { initUpload("../escape.bin", 2) }, 400)
+    assertStatus(intercept[BadRequestException] { initUpload("a/../escape.bin", 2) }, 400)
+
+    assertStatus(
+      intercept[BadRequestException] {
+        initUpload(s"a/${0.toChar}b.bin", 2)
+      },
+      400
+    )
+  }
+
+  it should "reject invalid type parameter" in {
+    val filePath = uniqueFilePath("init-bad-type")
+    val ex = intercept[BadRequestException] {
+      datasetResource.multipartUpload(
+        "not-a-real-type",
+        ownerUser.getEmail,
+        multipartDataset.getName,
+        urlEnc(filePath),
+        Optional.empty(),
+        multipartOwnerSessionUser
+      )
+    }
+    assertStatus(ex, 400)
+  }
+
+  it should "reject init when caller lacks WRITE access" in {
+    val filePath = uniqueFilePath("init-forbidden")
+    val ex = intercept[ForbiddenException] {
+      initUpload(filePath, numParts = 2, user = multipartNoWriteSessionUser)
+    }
+    assertStatus(ex, 403)
+  }
+
+  it should "handle init race: exactly one succeeds, one gets 409 CONFLICT" in {
+    val filePath = uniqueFilePath("init-race")
+    val barrier = new CyclicBarrier(2)
+
+    def callInit(): Either[Throwable, Response] =
+      try {
+        barrier.await()
+        Right(initUpload(filePath, numParts = 2))
+      } catch {
+        case t: Throwable => Left(t)
+      }
+
+    val future1 = Future(callInit())
+    val future2 = Future(callInit())
+    val results = Await.result(Future.sequence(Seq(future1, future2)), 30.seconds)
+
+    val oks = results.collect { case Right(r) if r.getStatus == 200 => r }
+    val fails = results.collect { case Left(t) => t }
+
+    oks.size shouldEqual 1
+    fails.size shouldEqual 1
+
+    fails.head match {
+      case e: WebApplicationException => assertStatus(e, 409)
+      case other =>
+        fail(
+          s"Expected WebApplicationException(CONFLICT), got: ${other.getClass} / ${other.getMessage}"
+        )
+    }
+
+    val sessionRecord = fetchSession(filePath)
+    sessionRecord should not be null
+    assertPlaceholdersCreated(sessionRecord.getUploadId, expectedParts = 2)
+  }
+
+  it should "reject sequential double init with 409 CONFLICT" in {
+    val filePath = uniqueFilePath("init-double")
+    initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+
+    val ex = intercept[WebApplicationException] { initUpload(filePath, numParts = 2) }
+    assertStatus(ex, 409)
+  }
+
+  // ---------------------------------------------------------------------------
+  // PART UPLOAD TESTS
+  // ---------------------------------------------------------------------------
+  "multipart-upload/part" should "reject uploadPart if init was not called" in {
+    val filePath = uniqueFilePath("part-no-init")
+    val ex = intercept[NotFoundException] {
+      uploadPart(filePath, partNumber = 1, bytes = Array[Byte](1, 2, 3))
+    }
+    assertStatus(ex, 404)
+  }
+
+  it should "reject missing/invalid Content-Length" in {
+    val filePath = uniqueFilePath("part-bad-cl")
+    initUpload(filePath, numParts = 2)
+
+    assertStatus(
+      intercept[BadRequestException] {
+        uploadPart(
+          filePath,
+          partNumber = 1,
+          bytes = Array[Byte](1, 2, 3),
+          missingContentLength = true
+        )
+      },
+      400
+    )
+
+    assertStatus(
+      intercept[BadRequestException] {
+        uploadPart(
+          filePath,
+          partNumber = 1,
+          bytes = Array[Byte](1, 2, 3),
+          contentLengthOverride = Some(0L)
+        )
+      },
+      400
+    )
+
+    assertStatus(
+      intercept[BadRequestException] {
+        uploadPart(
+          filePath,
+          partNumber = 1,
+          bytes = Array[Byte](1, 2, 3),
+          contentLengthOverride = Some(-5L)
+        )
+      },
+      400
+    )
+  }
+
+  it should "reject null/empty filePath param early without depending on error text" in {
+    val httpHeaders = mkHeaders(1L)
+
+    val ex1 = intercept[BadRequestException] {
+      datasetResource.uploadPart(
+        ownerUser.getEmail,
+        multipartDataset.getName,
+        null,
+        1,
+        new ByteArrayInputStream(Array.emptyByteArray),
+        httpHeaders,
+        multipartOwnerSessionUser
+      )
+    }
+    assertStatus(ex1, 400)
+
+    val ex2 = intercept[BadRequestException] {
+      datasetResource.uploadPart(
+        ownerUser.getEmail,
+        multipartDataset.getName,
+        "",
+        1,
+        new ByteArrayInputStream(Array.emptyByteArray),
+        httpHeaders,
+        multipartOwnerSessionUser
+      )
+    }
+    assertStatus(ex2, 400)
+  }
+
+  it should "reject invalid partNumber (< 1) and partNumber > requested" in {
+    val filePath = uniqueFilePath("part-bad-pn")
+    initUpload(filePath, numParts = 2)
+
+    assertStatus(
+      intercept[BadRequestException] {
+        uploadPart(filePath, partNumber = 0, bytes = tinyBytes(1.toByte))
+      },
+      400
+    )
+
+    assertStatus(
+      intercept[BadRequestException] {
+        uploadPart(filePath, partNumber = 3, bytes = minPartBytes(2.toByte))
+      },
+      400
+    )
+  }
+
+  it should "reject a non-final part smaller than the minimum size (without checking message)" in {
+    val filePath = uniqueFilePath("part-too-small-nonfinal")
+    initUpload(filePath, numParts = 2)
+
+    val ex = intercept[BadRequestException] {
+      uploadPart(filePath, partNumber = 1, bytes = tinyBytes(1.toByte))
+    }
+    assertStatus(ex, 400)
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+    fetchPartRows(uploadId).find(_.getPartNumber == 1).get.getEtag shouldEqual ""
+  }
+
+  it should "upload a part successfully and persist its ETag into DATASET_UPLOAD_SESSION_PART" in {
+    val filePath = uniqueFilePath("part-happy-db")
+    initUpload(filePath, numParts = 2)
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+    fetchPartRows(uploadId).find(_.getPartNumber == 1).get.getEtag shouldEqual ""
+
+    val bytes = minPartBytes(7.toByte)
+    uploadPart(filePath, partNumber = 1, bytes = bytes).getStatus shouldEqual 200
+
+    val after = fetchPartRows(uploadId).find(_.getPartNumber == 1).get
+    after.getEtag should not equal ""
+  }
+
+  it should "allow retrying the same part sequentially (no duplicates, etag ends non-empty)" in {
+    val filePath = uniqueFilePath("part-retry")
+    initUpload(filePath, numParts = 2)
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+    uploadPart(filePath, 1, minPartBytes(2.toByte)).getStatus shouldEqual 200
+
+    val rows = fetchPartRows(uploadId).filter(_.getPartNumber == 1)
+    rows.size shouldEqual 1
+    rows.head.getEtag should not equal ""
+  }
+
+  it should "apply per-part locking: return 409 if that part row is locked by another uploader" in {
+    val filePath = uniqueFilePath("part-lock")
+    initUpload(filePath, numParts = 2)
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    val connectionProvider = getDSLContext.configuration().connectionProvider()
+    val connection = connectionProvider.acquire()
+    connection.setAutoCommit(false)
+
+    try {
+      val locking = DSL.using(connection, SQLDialect.POSTGRES)
+      locking
+        .selectFrom(DATASET_UPLOAD_SESSION_PART)
+        .where(
+          DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+            .eq(uploadId)
+            .and(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.eq(1))
+        )
+        .forUpdate()
+        .fetchOne()
+
+      val ex = intercept[WebApplicationException] {
+        uploadPart(filePath, 1, minPartBytes(1.toByte))
+      }
+      assertStatus(ex, 409)
+    } finally {
+      connection.rollback()
+      connectionProvider.release(connection)
+    }
+
+    uploadPart(filePath, 1, minPartBytes(3.toByte)).getStatus shouldEqual 200
+  }
+
+  it should "not block other parts: locking part 1 does not prevent uploading part 2" in {
+    val filePath = uniqueFilePath("part-lock-other-part")
+    initUpload(filePath, numParts = 2)
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    val connectionProvider = getDSLContext.configuration().connectionProvider()
+    val connection = connectionProvider.acquire()
+    connection.setAutoCommit(false)
+
+    try {
+      val locking = DSL.using(connection, SQLDialect.POSTGRES)
+      locking
+        .selectFrom(DATASET_UPLOAD_SESSION_PART)
+        .where(
+          DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+            .eq(uploadId)
+            .and(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.eq(1))
+        )
+        .forUpdate()
+        .fetchOne()
+
+      uploadPart(filePath, 2, tinyBytes(9.toByte)).getStatus shouldEqual 200
+    } finally {
+      connection.rollback()
+      connectionProvider.release(connection)
+    }
+  }
+
+  it should "reject uploadPart when caller lacks WRITE access" in {
+    val filePath = uniqueFilePath("part-forbidden")
+    initUpload(filePath, numParts = 2)
+
+    val ex = intercept[ForbiddenException] {
+      uploadPart(filePath, 1, minPartBytes(1.toByte), user = multipartNoWriteSessionUser)
+    }
+    assertStatus(ex, 403)
+  }
+
+  // ---------------------------------------------------------------------------
+  // FINISH TESTS
+  // ---------------------------------------------------------------------------
+  "multipart-upload?type=finish" should "reject finish if init was not called" in {
+    val filePath = uniqueFilePath("finish-no-init")
+    val ex = intercept[NotFoundException] { finishUpload(filePath) }
+    assertStatus(ex, 404)
+  }
+
+  it should "reject finish when no parts were uploaded (all placeholders empty) without checking messages" in {
+    val filePath = uniqueFilePath("finish-no-parts")
+    initUpload(filePath, numParts = 2)
+
+    val ex = intercept[WebApplicationException] { finishUpload(filePath) }
+    assertStatus(ex, 409)
+
+    fetchSession(filePath) should not be null
+  }
+
+  it should "reject finish when some parts are missing (etag empty treated as missing)" in {
+    val filePath = uniqueFilePath("finish-missing")
+    initUpload(filePath, numParts = 3)
+
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+
+    val ex = intercept[WebApplicationException] { finishUpload(filePath) }
+    assertStatus(ex, 409)
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+    fetchPartRows(uploadId).find(_.getPartNumber == 2).get.getEtag shouldEqual ""
+    fetchPartRows(uploadId).find(_.getPartNumber == 3).get.getEtag shouldEqual ""
+  }
+
+  it should "reject finish when extra part rows exist in DB (bypass endpoint) without checking messages" in {
+    val filePath = uniqueFilePath("finish-extra-db")
+    initUpload(filePath, numParts = 2)
+
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+    uploadPart(filePath, 2, tinyBytes(2.toByte)).getStatus shouldEqual 200
+
+    val sessionRecord = fetchSession(filePath)
+    val uploadId = sessionRecord.getUploadId
+
+    getDSLContext
+      .insertInto(DATASET_UPLOAD_SESSION_PART)
+      .set(DATASET_UPLOAD_SESSION_PART.UPLOAD_ID, uploadId)
+      .set(DATASET_UPLOAD_SESSION_PART.PART_NUMBER, Integer.valueOf(3))
+      .set(DATASET_UPLOAD_SESSION_PART.ETAG, "bogus-etag")
+      .execute()
+
+    val ex = intercept[WebApplicationException] { finishUpload(filePath) }
+    assertStatus(ex, 500)
+
+    fetchSession(filePath) should not be null
+    fetchPartRows(uploadId).nonEmpty shouldEqual true
+  }
+
+  it should "finish successfully when all parts have non-empty etags; delete session + part rows" in {
+    val filePath = uniqueFilePath("finish-happy")
+    initUpload(filePath, numParts = 3)
+
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+    uploadPart(filePath, 2, minPartBytes(2.toByte)).getStatus shouldEqual 200
+    uploadPart(filePath, 3, tinyBytes(3.toByte)).getStatus shouldEqual 200
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    val resp = finishUpload(filePath)
+    resp.getStatus shouldEqual 200
+
+    fetchSession(filePath) shouldBe null
+    fetchPartRows(uploadId) shouldBe empty
+  }
+
+  it should "be idempotent-ish: second finish should return NotFound after successful finish" in {
+    val filePath = uniqueFilePath("finish-twice")
+    initUpload(filePath, numParts = 1)
+    uploadPart(filePath, 1, tinyBytes(1.toByte)).getStatus shouldEqual 200
+
+    finishUpload(filePath).getStatus shouldEqual 200
+
+    val ex = intercept[NotFoundException] { finishUpload(filePath) }
+    assertStatus(ex, 404)
+  }
+
+  it should "reject finish when caller lacks WRITE access" in {
+    val filePath = uniqueFilePath("finish-forbidden")
+    initUpload(filePath, numParts = 1)
+    uploadPart(filePath, 1, tinyBytes(1.toByte)).getStatus shouldEqual 200
+
+    val ex = intercept[ForbiddenException] {
+      finishUpload(filePath, user = multipartNoWriteSessionUser)
+    }
+    assertStatus(ex, 403)
+  }
+
+  it should "return 409 CONFLICT if the session row is locked by another finalizer/aborter" in {
+    val filePath = uniqueFilePath("finish-lock-race")
+    initUpload(filePath, numParts = 1)
+    uploadPart(filePath, 1, tinyBytes(1.toByte)).getStatus shouldEqual 200
+
+    val connectionProvider = getDSLContext.configuration().connectionProvider()
+    val connection = connectionProvider.acquire()
+    connection.setAutoCommit(false)
+
+    try {
+      val locking = DSL.using(connection, SQLDialect.POSTGRES)
+      locking
+        .selectFrom(DATASET_UPLOAD_SESSION)
+        .where(
+          DATASET_UPLOAD_SESSION.UID
+            .eq(ownerUser.getUid)
+            .and(DATASET_UPLOAD_SESSION.DID.eq(multipartDataset.getDid))
+            .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+        )
+        .forUpdate()
+        .fetchOne()
+
+      val ex = intercept[WebApplicationException] { finishUpload(filePath) }
+      assertStatus(ex, 409)
+    } finally {
+      connection.rollback()
+      connectionProvider.release(connection)
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // ABORT TESTS
+  // ---------------------------------------------------------------------------
+  "multipart-upload?type=abort" should "reject abort if init was not called" in {
+    val filePath = uniqueFilePath("abort-no-init")
+    val ex = intercept[NotFoundException] { abortUpload(filePath) }
+    assertStatus(ex, 404)
+  }
+
+  it should "abort successfully; delete session + part rows" in {
+    val filePath = uniqueFilePath("abort-happy")
+    initUpload(filePath, numParts = 2)
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    abortUpload(filePath).getStatus shouldEqual 200
+
+    fetchSession(filePath) shouldBe null
+    fetchPartRows(uploadId) shouldBe empty
+  }
+
+  it should "reject abort when caller lacks WRITE access" in {
+    val filePath = uniqueFilePath("abort-forbidden")
+    initUpload(filePath, numParts = 1)
+
+    val ex = intercept[ForbiddenException] {
+      abortUpload(filePath, user = multipartNoWriteSessionUser)
+    }
+    assertStatus(ex, 403)
+  }
+
+  it should "return 409 CONFLICT if the session row is locked by another finalizer/aborter" in {
+    val filePath = uniqueFilePath("abort-lock-race")
+    initUpload(filePath, numParts = 1)
+
+    val connectionProvider = getDSLContext.configuration().connectionProvider()
+    val connection = connectionProvider.acquire()
+    connection.setAutoCommit(false)
+
+    try {
+      val locking = DSL.using(connection, SQLDialect.POSTGRES)
+      locking
+        .selectFrom(DATASET_UPLOAD_SESSION)
+        .where(
+          DATASET_UPLOAD_SESSION.UID
+            .eq(ownerUser.getUid)
+            .and(DATASET_UPLOAD_SESSION.DID.eq(multipartDataset.getDid))
+            .and(DATASET_UPLOAD_SESSION.FILE_PATH.eq(filePath))
+        )
+        .forUpdate()
+        .fetchOne()
+
+      val ex = intercept[WebApplicationException] { abortUpload(filePath) }
+      assertStatus(ex, 409)
+    } finally {
+      connection.rollback()
+      connectionProvider.release(connection)
+    }
+  }
+
+  it should "be consistent: abort after finish should return NotFound" in {
+    val filePath = uniqueFilePath("abort-after-finish")
+    initUpload(filePath, numParts = 1)
+    uploadPart(filePath, 1, tinyBytes(1.toByte)).getStatus shouldEqual 200
+
+    finishUpload(filePath).getStatus shouldEqual 200
+
+    val ex = intercept[NotFoundException] { abortUpload(filePath) }
+    assertStatus(ex, 404)
+  }
+
+  // ---------------------------------------------------------------------------
+  // FAILURE / RESILIENCE (still unit tests; simulated failures)
+  // ---------------------------------------------------------------------------
+  "multipart upload implementation" should "release locks and keep DB consistent if the incoming stream fails mid-upload (simulated network drop)" in {
+    val filePath = uniqueFilePath("netfail-upload-stream")
+    initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    val payload = minPartBytes(5.toByte)
+
+    val flaky = new InputStream {
+      private var pos = 0
+      override def read(): Int = {
+        if (pos >= 1024) throw new IOException("simulated network drop")
+        val b = payload(pos) & 0xff
+        pos += 1
+        b
+      }
+    }
+
+    intercept[Throwable] {
+      uploadPartWithStream(
+        filePath,
+        partNumber = 1,
+        stream = flaky,
+        contentLength = payload.length.toLong
+      )
+    }
+
+    fetchPartRows(uploadId).find(_.getPartNumber == 1).get.getEtag shouldEqual ""
+
+    uploadPart(filePath, 1, payload).getStatus shouldEqual 200
+    fetchPartRows(uploadId).find(_.getPartNumber == 1).get.getEtag should not equal ""
+  }
+
+  it should "not delete session/parts if finalize fails downstream (simulate by corrupting an ETag)" in {
+    val filePath = uniqueFilePath("netfail-finish")
+    initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+    uploadPart(filePath, 2, tinyBytes(2.toByte)).getStatus shouldEqual 200
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+
+    getDSLContext
+      .update(DATASET_UPLOAD_SESSION_PART)
+      .set(DATASET_UPLOAD_SESSION_PART.ETAG, "definitely-not-a-real-etag")
+      .where(
+        DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+          .eq(uploadId)
+          .and(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.eq(1))
+      )
+      .execute()
+
+    intercept[Throwable] { finishUpload(filePath) }
+
+    fetchSession(filePath) should not be null
+    fetchPartRows(uploadId).nonEmpty shouldEqual true
+  }
+
+  it should "allow abort + re-init after part 1 succeeded but part 2 drops mid-flight; then complete successfully" in {
+    val filePath = uniqueFilePath("reinit-after-part2-drop")
+
+    initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+    val uploadId1 = fetchUploadIdOrFail(filePath)
+
+    uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+
+    val bytesPart2 = Array.fill[Byte](1024 * 1024)(2.toByte)
+    intercept[Throwable] {
+      uploadPartWithStream(
+        filePath,
+        partNumber = 2,
+        stream = flakyStream(bytesPart2, failAfterBytes = 4096),
+        contentLength = bytesPart2.length.toLong
+      )
+    }
+
+    abortUpload(filePath).getStatus shouldEqual 200
+    fetchSession(filePath) shouldBe null
+    fetchPartRows(uploadId1) shouldBe empty
+
+    initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+    uploadPart(filePath, 1, minPartBytes(3.toByte)).getStatus shouldEqual 200
+    uploadPart(filePath, 2, tinyBytes(4.toByte, n = 123)).getStatus shouldEqual 200
+    finishUpload(filePath).getStatus shouldEqual 200
+    fetchSession(filePath) shouldBe null
+  }
+
+  it should "allow re-upload after failures: (1) part1 drop, (2) part2 drop, (3) finalize failure; each followed by abort + re-init + success" in {
+    def abortAndAssertClean(filePath: String, uploadId: String): Unit = {
+      abortUpload(filePath).getStatus shouldEqual 200
+      fetchSession(filePath) shouldBe null
+      fetchPartRows(uploadId) shouldBe empty
+    }
+
+    def reinitAndFinishHappy(filePath: String): Unit = {
+      initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+      uploadPart(filePath, 1, minPartBytes(7.toByte)).getStatus shouldEqual 200
+      uploadPart(filePath, 2, tinyBytes(8.toByte, n = 321)).getStatus shouldEqual 200
+      finishUpload(filePath).getStatus shouldEqual 200
+      fetchSession(filePath) shouldBe null
+    }
+
+    withClue("scenario (1): part1 mid-flight drop") {
+      val filePath = uniqueFilePath("reupload-part1-drop")
+      initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+      val uploadId = fetchUploadIdOrFail(filePath)
+
+      val p1 = minPartBytes(5.toByte)
+      intercept[Throwable] {
+        uploadPartWithStream(
+          filePath,
+          partNumber = 1,
+          stream = flakyStream(p1, failAfterBytes = 4096),
+          contentLength = p1.length.toLong
+        )
+      }
+
+      fetchPartRows(uploadId).find(_.getPartNumber == 1).get.getEtag shouldEqual ""
+
+      abortAndAssertClean(filePath, uploadId)
+      reinitAndFinishHappy(filePath)
+    }
+
+    withClue("scenario (2): part2 mid-flight drop") {
+      val filePath = uniqueFilePath("reupload-part2-drop")
+      initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+      val uploadId = fetchUploadIdOrFail(filePath)
+
+      uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+      val bytesPart2 = Array.fill[Byte](1024 * 1024)(2.toByte)
+      intercept[Throwable] {
+        uploadPartWithStream(
+          filePath,
+          partNumber = 2,
+          stream = flakyStream(bytesPart2, failAfterBytes = 4096),
+          contentLength = bytesPart2.length.toLong
+        )
+      }
+
+      abortAndAssertClean(filePath, uploadId)
+      reinitAndFinishHappy(filePath)
+    }
+
+    withClue("scenario (3): finalize failure then re-upload") {
+      val filePath = uniqueFilePath("reupload-finalize-fail")
+      initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+
+      uploadPart(filePath, 1, minPartBytes(1.toByte)).getStatus shouldEqual 200
+      uploadPart(filePath, 2, tinyBytes(2.toByte)).getStatus shouldEqual 200
+
+      val uploadId = fetchUploadIdOrFail(filePath)
+      getDSLContext
+        .update(DATASET_UPLOAD_SESSION_PART)
+        .set(DATASET_UPLOAD_SESSION_PART.ETAG, "definitely-not-a-real-etag")
+        .where(
+          DATASET_UPLOAD_SESSION_PART.UPLOAD_ID
+            .eq(uploadId)
+            .and(DATASET_UPLOAD_SESSION_PART.PART_NUMBER.eq(1))
+        )
+        .execute()
+
+      intercept[Throwable] { finishUpload(filePath) }
+      fetchSession(filePath) should not be null
+      fetchPartRows(uploadId).nonEmpty shouldEqual true
+
+      abortAndAssertClean(filePath, uploadId)
+      reinitAndFinishHappy(filePath)
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // CORRUPTION CHECKS
+  // ---------------------------------------------------------------------------
+  it should "upload without corruption (sha256 matches final object)" in {
+    val filePath = uniqueFilePath("sha256-positive")
+    initUpload(filePath, numParts = 3).getStatus shouldEqual 200
+
+    val part1 = minPartBytes(1.toByte)
+    val part2 = minPartBytes(2.toByte)
+    val part3 = Array.fill[Byte](123)(3.toByte)
+
+    uploadPart(filePath, 1, part1).getStatus shouldEqual 200
+    uploadPart(filePath, 2, part2).getStatus shouldEqual 200
+    uploadPart(filePath, 3, part3).getStatus shouldEqual 200
+
+    finishUpload(filePath).getStatus shouldEqual 200
+
+    val expected = sha256OfChunks(Seq(part1, part2, part3))
+
+    val repoName = multipartDataset.getRepositoryName
+    val ref = "main"
+    val downloaded = LakeFSStorageClient.getFileFromRepo(repoName, ref, filePath)
+
+    val got = sha256OfFile(Paths.get(downloaded.toURI))
+    got.toSeq shouldEqual expected.toSeq
+  }
+
+  it should "detect corruption (sha256 mismatch when a part is altered)" in {
+    val filePath = uniqueFilePath("sha256-negative")
+    initUpload(filePath, numParts = 3).getStatus shouldEqual 200
+
+    val part1 = minPartBytes(1.toByte)
+    val part2 = minPartBytes(2.toByte)
+    val part3 = Array.fill[Byte](123)(3.toByte)
+
+    val intendedHash = sha256OfChunks(Seq(part1, part2, part3))
+
+    val part2corrupt = part2.clone()
+    part2corrupt(0) = (part2corrupt(0) ^ 0x01).toByte
+
+    uploadPart(filePath, 1, part1).getStatus shouldEqual 200
+    uploadPart(filePath, 2, part2corrupt).getStatus shouldEqual 200
+    uploadPart(filePath, 3, part3).getStatus shouldEqual 200
+
+    finishUpload(filePath).getStatus shouldEqual 200
+
+    val repoName = multipartDataset.getRepositoryName
+    val ref = "main"
+    val downloaded = LakeFSStorageClient.getFileFromRepo(repoName, ref, filePath)
+
+    val gotHash = sha256OfFile(Paths.get(downloaded.toURI))
+    gotHash.toSeq should not equal intendedHash.toSeq
+
+    val corruptHash = sha256OfChunks(Seq(part1, part2corrupt, part3))
+    gotHash.toSeq shouldEqual corruptHash.toSeq
+  }
+
+  // ---------------------------------------------------------------------------
+  // STRESS / SOAK TESTS (tagged)
+  // ---------------------------------------------------------------------------
+  it should "survive 2 concurrent multipart uploads (fan-out)" taggedAs (StressMultipart, Slow) in {
+    val parallelUploads = 2
+    val maxParts = 2
+
+    def oneUpload(i: Int): Future[Unit] =
+      Future {
+        val filePath = uniqueFilePath(s"stress-$i")
+        val numParts = 2 + Random.nextInt(maxParts - 1)
+
+        initUpload(filePath, numParts).getStatus shouldEqual 200
+
+        val sharedMin = minPartBytes((i % 127).toByte)
+        val partFuts = (1 to numParts).map { partN =>
+          Future {
+            val bytes =
+              if (partN < numParts) sharedMin
+              else tinyBytes((partN % 127).toByte, n = 1024)
+            uploadPart(filePath, partN, bytes).getStatus shouldEqual 200
+          }
+        }
+
+        Await.result(Future.sequence(partFuts), 60.seconds)
+
+        finishUpload(filePath).getStatus shouldEqual 200
+        fetchSession(filePath) shouldBe null
+      }
+
+    val all = Future.sequence((1 to parallelUploads).map(oneUpload))
+    Await.result(all, 180.seconds)
+  }
+
+  it should "throttle concurrent uploads of the SAME part via per-part locks" taggedAs (StressMultipart, Slow) in {
+    val filePath = uniqueFilePath("stress-same-part")
+    initUpload(filePath, numParts = 2).getStatus shouldEqual 200
+
+    val contenders = 2
+    val barrier = new CyclicBarrier(contenders)
+
+    def tryUploadStatus(): Future[Int] =
+      Future {
+        barrier.await()
+        try {
+          uploadPart(filePath, 1, minPartBytes(7.toByte)).getStatus
+        } catch {
+          case e: WebApplicationException => e.getResponse.getStatus
+        }
+      }
+
+    val statuses =
+      Await.result(Future.sequence((1 to contenders).map(_ => tryUploadStatus())), 60.seconds)
+
+    statuses.foreach { s => s should (be(200) or be(409)) }
+    statuses.count(_ == 200) should be >= 1
+
+    val uploadId = fetchUploadIdOrFail(filePath)
+    val part1 = fetchPartRows(uploadId).find(_.getPartNumber == 1).get
+    part1.getEtag.trim should not be ""
+  }
+}
diff --git a/core/gui/.editorconfig b/frontend/.editorconfig
similarity index 100%
rename from core/gui/.editorconfig
rename to frontend/.editorconfig
diff --git a/core/gui/.eslintrc.json b/frontend/.eslintrc.json
similarity index 100%
rename from core/gui/.eslintrc.json
rename to frontend/.eslintrc.json
diff --git a/core/gui/.gitignore b/frontend/.gitignore
similarity index 100%
rename from core/gui/.gitignore
rename to frontend/.gitignore
diff --git a/core/gui/.nvmrc b/frontend/.nvmrc
similarity index 100%
rename from core/gui/.nvmrc
rename to frontend/.nvmrc
diff --git a/core/gui/.prettierignore b/frontend/.prettierignore
similarity index 100%
rename from core/gui/.prettierignore
rename to frontend/.prettierignore
diff --git a/core/gui/.prettierrc.json b/frontend/.prettierrc.json
similarity index 100%
rename from core/gui/.prettierrc.json
rename to frontend/.prettierrc.json
diff --git a/core/gui/.yarn/releases/yarn-4.5.1.cjs b/frontend/.yarn/releases/yarn-4.5.1.cjs
similarity index 100%
rename from core/gui/.yarn/releases/yarn-4.5.1.cjs
rename to frontend/.yarn/releases/yarn-4.5.1.cjs
diff --git a/core/gui/.yarnrc.yml b/frontend/.yarnrc.yml
similarity index 100%
rename from core/gui/.yarnrc.yml
rename to frontend/.yarnrc.yml
diff --git a/core/gui/README.md b/frontend/README.md
similarity index 100%
rename from core/gui/README.md
rename to frontend/README.md
diff --git a/core/gui/angular.json b/frontend/angular.json
similarity index 100%
rename from core/gui/angular.json
rename to frontend/angular.json
diff --git a/core/gui/custom-webpack.config.js b/frontend/custom-webpack.config.js
similarity index 100%
rename from core/gui/custom-webpack.config.js
rename to frontend/custom-webpack.config.js
diff --git a/core/gui/git-version.js b/frontend/git-version.js
similarity index 100%
rename from core/gui/git-version.js
rename to frontend/git-version.js
diff --git a/core/gui/karma.conf.js b/frontend/karma.conf.js
similarity index 100%
rename from core/gui/karma.conf.js
rename to frontend/karma.conf.js
diff --git a/core/gui/nx.json b/frontend/nx.json
similarity index 89%
rename from core/gui/nx.json
rename to frontend/nx.json
index 9e871c3be94..727d14a7b0d 100644
--- a/core/gui/nx.json
+++ b/frontend/nx.json
@@ -32,7 +32,6 @@
       "cache": true
     }
   },
-  "nxCloudAccessToken": "Njk2ODE5NjMtMmRjNy00NjNmLWEwMDAtZGVkZTMwMmMwM2M2fHJlYWQtd3JpdGU=",
   "parallel": 1,
   "useLegacyCache": true
 }
diff --git a/core/gui/package.json b/frontend/package.json
similarity index 93%
rename from core/gui/package.json
rename to frontend/package.json
index e8aefd32f05..c18858f484d 100644
--- a/core/gui/package.json
+++ b/frontend/package.json
@@ -8,10 +8,10 @@
   "scripts": {
     "start": "concurrently --kill-others \"npx y-websocket\" \"ng serve\"",
     "build": "ng build --configuration=production --progress=false --source-map=false",
-    "build:ci": "nx build --configuration=production --progress=false --source-map=false",
+    "build:ci": "node --max-old-space-size=8192 ./node_modules/nx/bin/nx build --configuration=production --progress=false --source-map=false",
     "analyze": "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json",
     "test": "ng test --watch=false",
-    "test:ci": "node --max-old-space-size=6144 ./node_modules/nx/bin/nx test --watch=false --progress=false",
+    "test:ci": "node --max-old-space-size=8192 ./node_modules/nx/bin/nx test --watch=false --progress=false",
     "prettier:fix": "prettier --write ./src",
     "lint": "ng lint",
     "eslint:fix": "yarn eslint --fix ./src",
@@ -22,6 +22,7 @@
   "private": true,
   "dependencies": {
     "@abacritt/angularx-social-login": "2.3.0",
+    "@ai-sdk/openai": "2.0.67",
     "@ali-hm/angular-tree-component": "12.0.5",
     "@angular/animations": "16.2.12",
     "@angular/cdk": "16.2.12",
@@ -45,9 +46,12 @@
     "@stoplight/json-ref-resolver": "3.1.5",
     "@types/lodash-es": "4.17.4",
     "@types/plotly.js-basic-dist-min": "2.12.4",
+    "ai": "5.0.93",
     "ajv": "8.10.0",
     "backbone": "1.4.1",
+    "concaveman": "2.0.0",
     "content-disposition": "0.5.4",
+    "d3": "6.4.0",
     "dagre": "0.8.5",
     "deep-map": "2.0.0",
     "edit-distance": "1.0.4",
@@ -92,6 +96,7 @@
     "y-quill": "0.1.5",
     "y-websocket": "1.4.0",
     "yjs": "13.5.41",
+    "zod": "3.25.76",
     "zone.js": "0.13.0"
   },
   "resolutions": {
@@ -111,7 +116,9 @@
     "@nrwl/nx-cloud": "19.1.0",
     "@nx/angular": "20.0.3",
     "@types/backbone": "1.4.15",
+    "@types/concaveman": "1.1.6",
     "@types/content-disposition": "0",
+    "@types/d3-shape": "2.1.2",
     "@types/dagre": "0.7.47",
     "@types/file-saver": "2.0.5",
     "@types/graphlib": "2.1.8",
diff --git a/core/gui/proxy.config.json b/frontend/proxy.config.json
similarity index 82%
rename from core/gui/proxy.config.json
rename to frontend/proxy.config.json
index 3acc9a480c7..db8b690318a 100755
--- a/core/gui/proxy.config.json
+++ b/frontend/proxy.config.json
@@ -1,4 +1,14 @@
 {
+  "/api/models": {
+    "target": "http://localhost:9096",
+    "secure": false,
+    "changeOrigin": true
+  },
+  "/api/chat/completion": {
+    "target": "http://localhost:9096",
+    "secure": false,
+    "changeOrigin": true
+  },
   "/api/compile": {
     "target": "http://localhost:9090",
     "secure": false,
diff --git a/core/gui/src/app/app-routing.constant.ts b/frontend/src/app/app-routing.constant.ts
similarity index 100%
rename from core/gui/src/app/app-routing.constant.ts
rename to frontend/src/app/app-routing.constant.ts
diff --git a/core/gui/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
similarity index 93%
rename from core/gui/src/app/app-routing.module.ts
rename to frontend/src/app/app-routing.module.ts
index fffe3f8e428..a44c55393f3 100644
--- a/core/gui/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
+import { inject, NgModule } from "@angular/core";
+import { CanActivateFn, Router, RouterModule, Routes } from "@angular/router";
 import { DashboardComponent } from "./dashboard/component/dashboard.component";
 import { UserWorkflowComponent } from "./dashboard/component/user/user-workflow/user-workflow.component";
 import { UserQuotaComponent } from "./dashboard/component/user/user-quota/user-quota.component";
@@ -37,21 +37,16 @@ import { DatasetDetailComponent } from "./dashboard/component/user/user-dataset/
 import { UserDatasetComponent } from "./dashboard/component/user/user-dataset/user-dataset.component";
 import { HubWorkflowDetailComponent } from "./hub/component/workflow/detail/hub-workflow-detail.component";
 import { LandingPageComponent } from "./hub/component/landing-page/landing-page.component";
-import { DASHBOARD_USER_WORKFLOW } from "./app-routing.constant";
+import { DASHBOARD_ABOUT, DASHBOARD_USER_WORKFLOW } from "./app-routing.constant";
 import { HubSearchResultComponent } from "./hub/component/hub-search-result/hub-search-result.component";
 import { AdminSettingsComponent } from "./dashboard/component/admin/settings/admin-settings.component";
-import { inject } from "@angular/core";
 import { GuiConfigService } from "./common/service/gui-config.service";
-import { Router, CanActivateFn } from "@angular/router";
-import { DASHBOARD_ABOUT } from "./app-routing.constant";
 
 const rootRedirectGuard: CanActivateFn = () => {
   const config = inject(GuiConfigService);
   const router = inject(Router);
   try {
-    if (config.env.userSystemEnabled) {
-      return router.parseUrl(DASHBOARD_ABOUT);
-    }
+    return router.parseUrl(DASHBOARD_ABOUT);
   } catch {
     // config not loaded yet, swallow the error and let the app handle it
   }
diff --git a/core/gui/src/app/app.component.ts b/frontend/src/app/app.component.ts
similarity index 100%
rename from core/gui/src/app/app.component.ts
rename to frontend/src/app/app.component.ts
diff --git a/core/gui/src/app/app.module.ts b/frontend/src/app/app.module.ts
similarity index 93%
rename from core/gui/src/app/app.module.ts
rename to frontend/src/app/app.module.ts
index 13759e6e55a..5edf820dccb 100644
--- a/core/gui/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { DatePipe, registerLocaleData } from "@angular/common";
+import { DatePipe, registerLocaleData, CommonModule } from "@angular/common";
 import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http";
 import en from "@angular/common/locales/en";
-import { NgModule, APP_INITIALIZER } from "@angular/core";
+import { APP_INITIALIZER, NgModule, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { BrowserModule } from "@angular/platform-browser";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
@@ -100,8 +100,12 @@ import { NzPopconfirmModule } from "ng-zorro-antd/popconfirm";
 import { AdminGuardService } from "./dashboard/service/admin/guard/admin-guard.service";
 import { ContextMenuComponent } from "./workspace/component/workflow-editor/context-menu/context-menu/context-menu.component";
 import { CoeditorUserIconComponent } from "./workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component";
+import { AgentPanelComponent } from "./workspace/component/agent-panel/agent-panel.component";
+import { AgentChatComponent } from "./workspace/component/agent-panel/agent-chat/agent-chat.component";
+import { AgentRegistrationComponent } from "./workspace/component/agent-panel/agent-registration/agent-registration.component";
 import { InputAutoCompleteComponent } from "./workspace/component/input-autocomplete/input-autocomplete.component";
 import { CollabWrapperComponent } from "./common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component";
+import { TexeraCopilot } from "./workspace/service/copilot/texera-copilot";
 import { NzSwitchModule } from "ng-zorro-antd/switch";
 import { AboutComponent } from "./hub/component/about/about.component";
 import { NzLayoutModule } from "ng-zorro-antd/layout";
@@ -130,6 +134,7 @@ import { WorkflowRuntimeStatisticsComponent } from "./dashboard/component/user/u
 import { TimeTravelComponent } from "./workspace/component/left-panel/time-travel/time-travel.component";
 import { NzMessageModule } from "ng-zorro-antd/message";
 import { NzModalModule } from "ng-zorro-antd/modal";
+import { NzDescriptionsModule } from "ng-zorro-antd/descriptions";
 import { OverlayModule } from "@angular/cdk/overlay";
 import { HighlightSearchTermsPipe } from "./dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe";
 import { en_US, provideNzI18n } from "ng-zorro-antd/i18n";
@@ -158,9 +163,13 @@ import { BrowseSectionComponent } from "./hub/component/browse-section/browse-se
 import { BreakpointConditionInputComponent } from "./workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component";
 import { CodeDebuggerComponent } from "./workspace/component/code-editor-dialog/code-debugger.component";
 import { GoogleAuthService } from "./common/service/user/google-auth.service";
-import { SocialLoginModule, SocialAuthServiceConfig, GoogleSigninButtonModule } from "@abacritt/angularx-social-login";
-import { GoogleLoginProvider } from "@abacritt/angularx-social-login";
-import { lastValueFrom, firstValueFrom } from "rxjs";
+import {
+  GoogleLoginProvider,
+  GoogleSigninButtonModule,
+  SocialAuthServiceConfig,
+  SocialLoginModule,
+} from "@abacritt/angularx-social-login";
+import { catchError, firstValueFrom, lastValueFrom, of } from "rxjs";
 import { HubSearchResultComponent } from "./hub/component/hub-search-result/hub-search-result.component";
 import { UserDatasetStagedObjectsListComponent } from "./dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component";
 import { NzEmptyModule } from "ng-zorro-antd/empty";
@@ -169,9 +178,11 @@ import { NzProgressModule } from "ng-zorro-antd/progress";
 import { ComputingUnitSelectionComponent } from "./workspace/component/power-button/computing-unit-selection.component";
 import { NzSliderModule } from "ng-zorro-antd/slider";
 import { AdminSettingsComponent } from "./dashboard/component/admin/settings/admin-settings.component";
-import { catchError, of } from "rxjs";
 import { FormlyRepeatDndComponent } from "./common/formly/repeat-dnd/repeat-dnd.component";
 import { NzInputNumberModule } from "ng-zorro-antd/input-number";
+import { NzCheckboxModule } from "ng-zorro-antd/checkbox";
+import { JupyterUploadSuccessComponent } from "./dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component";
+import { JupyterNotebookPanelComponent } from "./workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component";
 
 registerLocaleData(en);
 
@@ -199,6 +210,7 @@ registerLocaleData(en);
     UserAvatarComponent,
     LocalLoginComponent,
     UserWorkflowComponent,
+    JupyterUploadSuccessComponent,
     UserQuotaComponent,
     RowModalComponent,
     OperatorLabelComponent,
@@ -238,6 +250,9 @@ registerLocaleData(en);
     LocalLoginComponent,
     ContextMenuComponent,
     CoeditorUserIconComponent,
+    AgentPanelComponent,
+    AgentChatComponent,
+    AgentRegistrationComponent,
     InputAutoCompleteComponent,
     FileSelectionComponent,
     CollabWrapperComponent,
@@ -264,9 +279,11 @@ registerLocaleData(en);
     HubSearchResultComponent,
     ComputingUnitSelectionComponent,
     AdminSettingsComponent,
+    JupyterNotebookPanelComponent,
   ],
   imports: [
     BrowserModule,
+    CommonModule,
     AppRoutingModule,
     HttpClientModule,
     JwtModule.forRoot({
@@ -303,6 +320,7 @@ registerLocaleData(en);
     NgxJsonViewerModule,
     NzMessageModule,
     NzModalModule,
+    NzDescriptionsModule,
     NzCardModule,
     NzTagModule,
     NzPopconfirmModule,
@@ -330,6 +348,7 @@ registerLocaleData(en);
     NzDividerModule,
     NzProgressModule,
     NzInputNumberModule,
+    NzCheckboxModule,
   ],
   providers: [
     provideNzI18n(en_US),
@@ -340,6 +359,7 @@ registerLocaleData(en);
     GuiConfigService,
     FileSaverService,
     ReportGenerationService,
+    TexeraCopilot,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: BlobErrorHttpInterceptor,
@@ -376,5 +396,6 @@ registerLocaleData(en);
     },
   ],
   bootstrap: [AppComponent],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class AppModule {}
diff --git a/core/gui/src/app/common/app-setting.ts b/frontend/src/app/common/app-setting.ts
similarity index 100%
rename from core/gui/src/app/common/app-setting.ts
rename to frontend/src/app/common/app-setting.ts
diff --git a/core/gui/src/app/common/formly/array.type.ts b/frontend/src/app/common/formly/array.type.ts
similarity index 100%
rename from core/gui/src/app/common/formly/array.type.ts
rename to frontend/src/app/common/formly/array.type.ts
diff --git a/core/gui/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.css b/frontend/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.css
similarity index 100%
rename from core/gui/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.css
rename to frontend/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.css
diff --git a/core/gui/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.html b/frontend/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.html
similarity index 100%
rename from core/gui/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.html
rename to frontend/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.html
diff --git a/core/gui/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.ts b/frontend/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.ts
similarity index 100%
rename from core/gui/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.ts
rename to frontend/src/app/common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component.ts
diff --git a/core/gui/src/app/common/formly/formly-config.ts b/frontend/src/app/common/formly/formly-config.ts
similarity index 100%
rename from core/gui/src/app/common/formly/formly-config.ts
rename to frontend/src/app/common/formly/formly-config.ts
diff --git a/core/gui/src/app/common/formly/formly-utils.ts b/frontend/src/app/common/formly/formly-utils.ts
similarity index 100%
rename from core/gui/src/app/common/formly/formly-utils.ts
rename to frontend/src/app/common/formly/formly-utils.ts
diff --git a/core/gui/src/app/common/formly/multischema.type.ts b/frontend/src/app/common/formly/multischema.type.ts
similarity index 100%
rename from core/gui/src/app/common/formly/multischema.type.ts
rename to frontend/src/app/common/formly/multischema.type.ts
diff --git a/core/gui/src/app/common/formly/null.type.ts b/frontend/src/app/common/formly/null.type.ts
similarity index 100%
rename from core/gui/src/app/common/formly/null.type.ts
rename to frontend/src/app/common/formly/null.type.ts
diff --git a/core/gui/src/app/common/formly/object.type.ts b/frontend/src/app/common/formly/object.type.ts
similarity index 100%
rename from core/gui/src/app/common/formly/object.type.ts
rename to frontend/src/app/common/formly/object.type.ts
diff --git a/core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.html b/frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.html
similarity index 100%
rename from core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.html
rename to frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.html
diff --git a/core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.scss b/frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.scss
similarity index 100%
rename from core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.scss
rename to frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.scss
diff --git a/core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.spec.ts b/frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.spec.ts
similarity index 100%
rename from core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.spec.ts
rename to frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.spec.ts
diff --git a/core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.ts b/frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.ts
similarity index 99%
rename from core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.ts
rename to frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.ts
index 68ab46065af..07d41c890bb 100644
--- a/core/gui/src/app/common/formly/preset-wrapper/preset-wrapper.component.ts
+++ b/frontend/src/app/common/formly/preset-wrapper/preset-wrapper.component.ts
@@ -21,7 +21,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { FieldWrapper, FormlyFieldConfig } from "@ngx-formly/core";
 import { merge } from "lodash";
 import { ReplaySubject } from "rxjs";
-import { takeUntil, debounceTime, filter, first } from "rxjs/operators";
+import { debounceTime, filter, first, takeUntil } from "rxjs/operators";
 import { Preset, PresetService } from "src/app/workspace/service/preset/preset.service";
 import { asType } from "../../util/assert";
 import { NzMessageService } from "ng-zorro-antd/message";
diff --git a/core/gui/src/app/common/formly/repeat-dnd/repeat-dnd.component.css b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.css
similarity index 100%
rename from core/gui/src/app/common/formly/repeat-dnd/repeat-dnd.component.css
rename to frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.css
diff --git a/core/gui/src/app/common/formly/repeat-dnd/repeat-dnd.component.html b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.html
similarity index 100%
rename from core/gui/src/app/common/formly/repeat-dnd/repeat-dnd.component.html
rename to frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.html
diff --git a/core/gui/src/app/common/formly/repeat-dnd/repeat-dnd.component.ts b/frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.ts
similarity index 100%
rename from core/gui/src/app/common/formly/repeat-dnd/repeat-dnd.component.ts
rename to frontend/src/app/common/formly/repeat-dnd/repeat-dnd.component.ts
diff --git a/core/gui/src/app/common/service/blob-error-http-interceptor.service.ts b/frontend/src/app/common/service/blob-error-http-interceptor.service.ts
similarity index 100%
rename from core/gui/src/app/common/service/blob-error-http-interceptor.service.ts
rename to frontend/src/app/common/service/blob-error-http-interceptor.service.ts
diff --git a/core/gui/src/app/common/service/gmail/gmail.service.ts b/frontend/src/app/common/service/gmail/gmail.service.ts
similarity index 99%
rename from core/gui/src/app/common/service/gmail/gmail.service.ts
rename to frontend/src/app/common/service/gmail/gmail.service.ts
index 0e61418fd7d..c4794e74713 100644
--- a/core/gui/src/app/common/service/gmail/gmail.service.ts
+++ b/frontend/src/app/common/service/gmail/gmail.service.ts
@@ -21,6 +21,7 @@ import { Injectable } from "@angular/core";
 import { HttpClient, HttpErrorResponse } from "@angular/common/http";
 import { AppSettings } from "../../app-setting";
 import { NotificationService } from "../notification/notification.service";
+
 @Injectable({
   providedIn: "root",
 })
diff --git a/core/gui/src/app/common/service/gui-config.service.mock.ts b/frontend/src/app/common/service/gui-config.service.mock.ts
similarity index 97%
rename from core/gui/src/app/common/service/gui-config.service.mock.ts
rename to frontend/src/app/common/service/gui-config.service.mock.ts
index f16a3697f0d..daa8adfd224 100644
--- a/core/gui/src/app/common/service/gui-config.service.mock.ts
+++ b/frontend/src/app/common/service/gui-config.service.mock.ts
@@ -30,7 +30,6 @@ export class MockGuiConfigService {
   private _config: GuiConfig = {
     exportExecutionResultEnabled: false,
     autoAttributeCorrectionEnabled: false,
-    userSystemEnabled: true,
     selectingFilesFromDatasetsEnabled: false,
     localLogin: true,
     googleLogin: true,
@@ -49,6 +48,8 @@ export class MockGuiConfigService {
     defaultLocalUser: { username: "", password: "" },
     expirationTimeInMinutes: 2880,
     activeTimeInMinutes: 15,
+    copilotEnabled: false,
+    limitColumns: 15,
   };
 
   get env(): GuiConfig {
diff --git a/core/gui/src/app/common/service/gui-config.service.ts b/frontend/src/app/common/service/gui-config.service.ts
similarity index 89%
rename from core/gui/src/app/common/service/gui-config.service.ts
rename to frontend/src/app/common/service/gui-config.service.ts
index 65fd2f59afe..a2e164efeb1 100644
--- a/core/gui/src/app/common/service/gui-config.service.ts
+++ b/frontend/src/app/common/service/gui-config.service.ts
@@ -31,10 +31,8 @@ export class GuiConfigService {
 
   load(): Observable<GuiConfig> {
     // Fetch both GUI config and user system config in parallel
-    const guiConfig$ = this.http.get<Omit<GuiConfig, "userSystemEnabled" | "inviteOnly">>(
-      `${AppSettings.getApiEndpoint()}/config/gui`
-    );
-    const userSystemConfig$ = this.http.get<{ userSystemEnabled: boolean; inviteOnly: boolean }>(
+    const guiConfig$ = this.http.get<Omit<GuiConfig, "inviteOnly">>(`${AppSettings.getApiEndpoint()}/config/gui`);
+    const userSystemConfig$ = this.http.get<{ inviteOnly: boolean }>(
       `${AppSettings.getApiEndpoint()}/config/user-system`
     );
 
diff --git a/core/gui/src/app/common/service/notification/notification.service.spec.ts b/frontend/src/app/common/service/notification/notification.service.spec.ts
similarity index 100%
rename from core/gui/src/app/common/service/notification/notification.service.spec.ts
rename to frontend/src/app/common/service/notification/notification.service.spec.ts
diff --git a/core/gui/src/app/common/service/notification/notification.service.ts b/frontend/src/app/common/service/notification/notification.service.ts
similarity index 100%
rename from core/gui/src/app/common/service/notification/notification.service.ts
rename to frontend/src/app/common/service/notification/notification.service.ts
diff --git a/core/gui/src/app/common/service/user/auth-guard.service.ts b/frontend/src/app/common/service/user/auth-guard.service.ts
similarity index 92%
rename from core/gui/src/app/common/service/user/auth-guard.service.ts
rename to frontend/src/app/common/service/user/auth-guard.service.ts
index ba6ef4dd9a4..3e6e3158711 100644
--- a/core/gui/src/app/common/service/user/auth-guard.service.ts
+++ b/frontend/src/app/common/service/user/auth-guard.service.ts
@@ -18,7 +18,7 @@
  */
 
 import { Injectable } from "@angular/core";
-import { Router, CanActivate, RouterStateSnapshot, ActivatedRouteSnapshot } from "@angular/router";
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
 import { GuiConfigService } from "../gui-config.service";
 import { UserService } from "./user.service";
 import { DASHBOARD_ABOUT } from "../../../app-routing.constant";
@@ -35,7 +35,7 @@ export class AuthGuardService implements CanActivate {
     private config: GuiConfigService
   ) {}
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    if (this.userService.isLogin() || !this.config.env.userSystemEnabled) {
+    if (this.userService.isLogin()) {
       return true;
     } else {
       this.router.navigate([DASHBOARD_ABOUT], { queryParams: { returnUrl: state.url === "/" ? null : state.url } });
diff --git a/core/gui/src/app/common/service/user/auth.service.ts b/frontend/src/app/common/service/user/auth.service.ts
similarity index 96%
rename from core/gui/src/app/common/service/user/auth.service.ts
rename to frontend/src/app/common/service/user/auth.service.ts
index 2f470367122..d97c8afc25b 100644
--- a/core/gui/src/app/common/service/user/auth.service.ts
+++ b/frontend/src/app/common/service/user/auth.service.ts
@@ -18,12 +18,11 @@
  */
 
 import { HttpClient } from "@angular/common/http";
-import { Injectable, Inject } from "@angular/core";
-import { interval, Observable, Subscription } from "rxjs";
+import { Injectable } from "@angular/core";
+import { Observable, Subscription, timer } from "rxjs";
 import { AppSettings } from "../../app-setting";
-import { User, Role } from "../../type/user";
-import { timer } from "rxjs";
-import { startWith, ignoreElements } from "rxjs/operators";
+import { Role, User } from "../../type/user";
+import { ignoreElements } from "rxjs/operators";
 import { JwtHelperService } from "@auth0/angular-jwt";
 import { NotificationService } from "../notification/notification.service";
 import { GmailService } from "../gmail/gmail.service";
diff --git a/core/gui/src/app/common/service/user/config/user-config.service.spec.ts b/frontend/src/app/common/service/user/config/user-config.service.spec.ts
similarity index 100%
rename from core/gui/src/app/common/service/user/config/user-config.service.spec.ts
rename to frontend/src/app/common/service/user/config/user-config.service.spec.ts
diff --git a/core/gui/src/app/common/service/user/config/user-config.service.ts b/frontend/src/app/common/service/user/config/user-config.service.ts
similarity index 99%
rename from core/gui/src/app/common/service/user/config/user-config.service.ts
rename to frontend/src/app/common/service/user/config/user-config.service.ts
index c053092b140..abbc73b2230 100644
--- a/core/gui/src/app/common/service/user/config/user-config.service.ts
+++ b/frontend/src/app/common/service/user/config/user-config.service.ts
@@ -23,7 +23,6 @@ import { Observable, of, Subject } from "rxjs";
 import { AppSettings } from "src/app/common/app-setting";
 import { UserService } from "../user.service";
 import { shareReplay, tap } from "rxjs/operators";
-import { isType } from "src/app/common/util/assert";
 
 export type UserConfig = {
   [key: string]: string;
diff --git a/core/gui/src/app/common/service/user/google-auth.service.ts b/frontend/src/app/common/service/user/google-auth.service.ts
similarity index 100%
rename from core/gui/src/app/common/service/user/google-auth.service.ts
rename to frontend/src/app/common/service/user/google-auth.service.ts
diff --git a/core/gui/src/app/common/service/user/stub-auth.service.ts b/frontend/src/app/common/service/user/stub-auth.service.ts
similarity index 98%
rename from core/gui/src/app/common/service/user/stub-auth.service.ts
rename to frontend/src/app/common/service/user/stub-auth.service.ts
index 96ef38c4515..2bb5f915349 100644
--- a/core/gui/src/app/common/service/user/stub-auth.service.ts
+++ b/frontend/src/app/common/service/user/stub-auth.service.ts
@@ -19,7 +19,7 @@
 
 import { Injectable } from "@angular/core";
 
-import { Observable, of, throwError } from "rxjs";
+import { Observable, of } from "rxjs";
 import { User } from "../../type/user";
 import { PublicInterfaceOf } from "../../util/stub";
 import { AuthService } from "./auth.service";
diff --git a/core/gui/src/app/common/service/user/stub-user.service.ts b/frontend/src/app/common/service/user/stub-user.service.ts
similarity index 94%
rename from core/gui/src/app/common/service/user/stub-user.service.ts
rename to frontend/src/app/common/service/user/stub-user.service.ts
index 06f09bf05de..b703d40331d 100644
--- a/core/gui/src/app/common/service/user/stub-user.service.ts
+++ b/frontend/src/app/common/service/user/stub-user.service.ts
@@ -84,4 +84,12 @@ export class StubUserService implements PublicInterfaceOf<UserService> {
   getAvatar(googleAvatar: string): Observable<string | undefined> {
     return of(undefined);
   }
+
+  checkAffiliation(): Observable<Boolean> {
+    return of(true);
+  }
+
+  updateAffiliation(_affiliation: string): Observable<void> {
+    return of(void 0);
+  }
 }
diff --git a/core/gui/src/app/common/service/user/user.service.spec.ts b/frontend/src/app/common/service/user/user.service.spec.ts
similarity index 96%
rename from core/gui/src/app/common/service/user/user.service.spec.ts
rename to frontend/src/app/common/service/user/user.service.spec.ts
index 2cec48de09e..70b595ca9dc 100644
--- a/core/gui/src/app/common/service/user/user.service.spec.ts
+++ b/frontend/src/app/common/service/user/user.service.spec.ts
@@ -23,6 +23,7 @@ import { AuthService } from "./auth.service";
 import { StubAuthService } from "./stub-auth.service";
 import { skip } from "rxjs/operators";
 import { commonTestProviders } from "../../testing/test-utils";
+import { HttpClientTestingModule } from "@angular/common/http/testing";
 
 describe("UserService", () => {
   let service: UserService;
@@ -30,6 +31,7 @@ describe("UserService", () => {
   beforeEach(() => {
     AuthService.removeAccessToken();
     TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
       providers: [UserService, { provide: AuthService, useClass: StubAuthService }, ...commonTestProviders],
     });
 
diff --git a/core/gui/src/app/common/service/user/user.service.ts b/frontend/src/app/common/service/user/user.service.ts
similarity index 82%
rename from core/gui/src/app/common/service/user/user.service.ts
rename to frontend/src/app/common/service/user/user.service.ts
index 0d42910cc13..689a95d0286 100644
--- a/core/gui/src/app/common/service/user/user.service.ts
+++ b/frontend/src/app/common/service/user/user.service.ts
@@ -18,6 +18,8 @@
  */
 
 import { Injectable } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import { AppSettings } from "../../app-setting";
 import { Observable, of, ReplaySubject } from "rxjs";
 import { Role, User } from "../../type/user";
 import { AuthService } from "./auth.service";
@@ -39,14 +41,12 @@ export class UserService {
 
   constructor(
     private authService: AuthService,
-    private config: GuiConfigService
+    private config: GuiConfigService,
+    private http: HttpClient
   ) {
-    if (this.config.env.userSystemEnabled) {
-      const user = this.authService.loginWithExistingToken();
-      this.changeUser(user);
-    }
+    const user = this.authService.loginWithExistingToken();
+    this.changeUser(user);
   }
-
   public getCurrentUser(): User | undefined {
     return this.currentUser;
   }
@@ -85,6 +85,38 @@ export class UserService {
       .pipe(map(({ accessToken }) => this.handleAccessToken(accessToken)));
   }
 
+  /**
+   * Retrieves affiliation from backend and return if affiliation has been prompted
+   * true: already prompted
+   * false: never prompted
+   */
+  public checkAffiliation(): Observable<Boolean> {
+    const user = this.currentUser;
+    if (!user) {
+      return of(false);
+    }
+    return this.http.get<Boolean>(`${AppSettings.getApiEndpoint()}/user/affiliation`, {
+      params: { uid: user.uid.toString() },
+    });
+  }
+
+  /**
+   * updates a new registered user's affiliation
+   * @param affiliation
+   */
+  public updateAffiliation(affiliation: string): Observable<void> {
+    const user = this.currentUser;
+
+    if (!user) {
+      return of(void 0);
+    }
+
+    return this.http.put<void>(`${AppSettings.getApiEndpoint()}/user/affiliation`, {
+      uid: user.uid,
+      affiliation: affiliation,
+    });
+  }
+
   /**
    * changes the current user and triggers currentUserSubject
    * @param user
diff --git a/core/gui/src/app/common/service/workflow-persist/stub-workflow-persist.service.ts b/frontend/src/app/common/service/workflow-persist/stub-workflow-persist.service.ts
similarity index 100%
rename from core/gui/src/app/common/service/workflow-persist/stub-workflow-persist.service.ts
rename to frontend/src/app/common/service/workflow-persist/stub-workflow-persist.service.ts
diff --git a/core/gui/src/app/common/service/workflow-persist/workflow-persist.service.spec.ts b/frontend/src/app/common/service/workflow-persist/workflow-persist.service.spec.ts
similarity index 100%
rename from core/gui/src/app/common/service/workflow-persist/workflow-persist.service.spec.ts
rename to frontend/src/app/common/service/workflow-persist/workflow-persist.service.spec.ts
diff --git a/core/gui/src/app/common/service/workflow-persist/workflow-persist.service.ts b/frontend/src/app/common/service/workflow-persist/workflow-persist.service.ts
similarity index 96%
rename from core/gui/src/app/common/service/workflow-persist/workflow-persist.service.ts
rename to frontend/src/app/common/service/workflow-persist/workflow-persist.service.ts
index 5905b37d891..5e738c5add2 100644
--- a/core/gui/src/app/common/service/workflow-persist/workflow-persist.service.ts
+++ b/frontend/src/app/common/service/workflow-persist/workflow-persist.service.ts
@@ -20,7 +20,7 @@
 import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable, throwError } from "rxjs";
-import { filter, map, catchError } from "rxjs/operators";
+import { catchError, filter, map } from "rxjs/operators";
 import { AppSettings } from "../../app-setting";
 import { Workflow, WorkflowContent } from "../../type/workflow";
 import { DashboardWorkflow } from "../../../dashboard/type/dashboard-workflow.interface";
@@ -41,7 +41,7 @@ export const WORKFLOW_UPDATENAME_URL = WORKFLOW_BASE_URL + "/update/name";
 export const WORKFLOW_UPDATEDESCRIPTION_URL = WORKFLOW_BASE_URL + "/update/description";
 export const WORKFLOW_OWNER_URL = WORKFLOW_BASE_URL + "/user-workflow-owners";
 export const WORKFLOW_ID_URL = WORKFLOW_BASE_URL + "/user-workflow-ids";
-export const WORKFLOW_OWNER_USER = WORKFLOW_BASE_URL + "/owner_user";
+export const WORKFLOW_OWNER_NAME = WORKFLOW_BASE_URL + "/owner_name";
 export const WORKFLOW_NAME = WORKFLOW_BASE_URL + "/workflow_name";
 export const WORKFLOW_PUBLIC_WORKFLOW = WORKFLOW_BASE_URL + "/publicised";
 export const WORKFLOW_DESCRIPTION = WORKFLOW_BASE_URL + "/workflow_description";
@@ -238,13 +238,12 @@ export class WorkflowPersistService {
   }
 
   /**
-   * retrieve the complete information of the owner corresponding to the wid
-   * can be used without logging in
-   * @param wid
+   * Retrieve workflow owner name (no login required).
+   * @param wid workflow id
    */
-  public getOwnerUser(wid: number): Observable<User> {
+  public getOwnerName(wid: number): Observable<string> {
     const params = new HttpParams().set("wid", wid);
-    return this.http.get<User>(`${AppSettings.getApiEndpoint()}/${WORKFLOW_OWNER_USER}`, { params });
+    return this.http.get(`${AppSettings.getApiEndpoint()}/${WORKFLOW_OWNER_NAME}`, { params, responseType: "text" });
   }
 
   /**
diff --git a/core/gui/src/app/common/testing/test-utils.ts b/frontend/src/app/common/testing/test-utils.ts
similarity index 100%
rename from core/gui/src/app/common/testing/test-utils.ts
rename to frontend/src/app/common/testing/test-utils.ts
diff --git a/core/gui/src/app/common/type/dataset-file.ts b/frontend/src/app/common/type/dataset-file.ts
similarity index 100%
rename from core/gui/src/app/common/type/dataset-file.ts
rename to frontend/src/app/common/type/dataset-file.ts
diff --git a/core/gui/src/app/common/type/dataset-staged-object.ts b/frontend/src/app/common/type/dataset-staged-object.ts
similarity index 100%
rename from core/gui/src/app/common/type/dataset-staged-object.ts
rename to frontend/src/app/common/type/dataset-staged-object.ts
diff --git a/core/gui/src/app/common/type/dataset.ts b/frontend/src/app/common/type/dataset.ts
similarity index 100%
rename from core/gui/src/app/common/type/dataset.ts
rename to frontend/src/app/common/type/dataset.ts
diff --git a/core/gui/src/app/common/type/datasetVersionFileTree.ts b/frontend/src/app/common/type/datasetVersionFileTree.ts
similarity index 100%
rename from core/gui/src/app/common/type/datasetVersionFileTree.ts
rename to frontend/src/app/common/type/datasetVersionFileTree.ts
diff --git a/core/gui/src/app/common/type/execution.ts b/frontend/src/app/common/type/execution.ts
similarity index 100%
rename from core/gui/src/app/common/type/execution.ts
rename to frontend/src/app/common/type/execution.ts
diff --git a/core/gui/src/app/common/type/generic-web-response.ts b/frontend/src/app/common/type/generic-web-response.ts
similarity index 100%
rename from core/gui/src/app/common/type/generic-web-response.ts
rename to frontend/src/app/common/type/generic-web-response.ts
diff --git a/core/gui/src/app/common/type/gui-config.ts b/frontend/src/app/common/type/gui-config.ts
similarity index 97%
rename from core/gui/src/app/common/type/gui-config.ts
rename to frontend/src/app/common/type/gui-config.ts
index f7c1181b180..b47dfa0ab1b 100644
--- a/core/gui/src/app/common/type/gui-config.ts
+++ b/frontend/src/app/common/type/gui-config.ts
@@ -21,7 +21,6 @@
 export interface GuiConfig {
   exportExecutionResultEnabled: boolean;
   autoAttributeCorrectionEnabled: boolean;
-  userSystemEnabled: boolean;
   selectingFilesFromDatasetsEnabled: boolean;
   localLogin: boolean;
   googleLogin: boolean;
@@ -40,6 +39,8 @@ export interface GuiConfig {
   defaultLocalUser?: { username?: string; password?: string };
   expirationTimeInMinutes: number;
   activeTimeInMinutes: number;
+  copilotEnabled: boolean;
+  limitColumns: number;
 }
 
 export interface SidebarTabs {
diff --git a/core/gui/src/app/common/type/physical-plan.ts b/frontend/src/app/common/type/physical-plan.ts
similarity index 88%
rename from core/gui/src/app/common/type/physical-plan.ts
rename to frontend/src/app/common/type/physical-plan.ts
index dece82cebb5..a2efaa5b936 100644
--- a/core/gui/src/app/common/type/physical-plan.ts
+++ b/frontend/src/app/common/type/physical-plan.ts
@@ -21,8 +21,8 @@ import {
   ExecutionIdentity,
   PhysicalOpIdentity,
   WorkflowIdentity,
-} from "./proto/edu/uci/ics/amber/engine/common/virtualidentity";
-import { PhysicalLink } from "./proto/edu/uci/ics/amber/engine/common/workflow";
+} from "./proto/org/apache/texera/amber/engine/common/virtualidentity";
+import { PhysicalLink } from "./proto/org/apache/texera/amber/engine/common/workflow";
 
 export interface PhysicalOp {
   id: PhysicalOpIdentity;
diff --git a/core/gui/src/app/common/type/proto/google/protobuf/descriptor.ts b/frontend/src/app/common/type/proto/google/protobuf/descriptor.ts
similarity index 100%
rename from core/gui/src/app/common/type/proto/google/protobuf/descriptor.ts
rename to frontend/src/app/common/type/proto/google/protobuf/descriptor.ts
diff --git a/core/gui/src/app/common/type/proto/edu/uci/ics/amber/engine/common/virtualidentity.ts b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/virtualidentity.ts
similarity index 99%
rename from core/gui/src/app/common/type/proto/edu/uci/ics/amber/engine/common/virtualidentity.ts
rename to frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/virtualidentity.ts
index 8ea9daeec3f..9b1b10d0c7c 100644
--- a/core/gui/src/app/common/type/proto/edu/uci/ics/amber/engine/common/virtualidentity.ts
+++ b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/virtualidentity.ts
@@ -21,12 +21,12 @@
 // versions:
 //   protoc-gen-ts_proto  v2.2.0
 //   protoc               v5.28.3
-// source: edu/uci/ics/amber/engine/common/virtualidentity.proto
+// source: org/apache/amber/engine/common/virtualidentity.proto
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
 
-export const protobufPackage = "edu.uci.ics.amber.engine.common";
+export const protobufPackage = "org.apache.texera.amber.engine.common";
 
 export interface WorkflowIdentity {
   id: number;
diff --git a/core/gui/src/app/common/type/proto/edu/uci/ics/amber/engine/common/workflow.ts b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/workflow.ts
similarity index 99%
rename from core/gui/src/app/common/type/proto/edu/uci/ics/amber/engine/common/workflow.ts
rename to frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/workflow.ts
index 481e514381f..05dc6cde454 100644
--- a/core/gui/src/app/common/type/proto/edu/uci/ics/amber/engine/common/workflow.ts
+++ b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/workflow.ts
@@ -21,13 +21,13 @@
 // versions:
 //   protoc-gen-ts_proto  v2.2.0
 //   protoc               v5.28.3
-// source: edu/uci/ics/amber/engine/common/workflow.proto
+// source: org/apache/amber/engine/common/workflow.proto
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
 import { PhysicalOpIdentity } from "./virtualidentity";
 
-export const protobufPackage = "edu.uci.ics.amber.engine.common";
+export const protobufPackage = "org.apache.texera.amber.engine.common";
 
 export interface PortIdentity {
   id: number;
diff --git a/core/gui/src/app/common/type/proto/scalapb/scalapb.ts b/frontend/src/app/common/type/proto/scalapb/scalapb.ts
similarity index 100%
rename from core/gui/src/app/common/type/proto/scalapb/scalapb.ts
rename to frontend/src/app/common/type/proto/scalapb/scalapb.ts
diff --git a/core/gui/src/app/common/type/user.ts b/frontend/src/app/common/type/user.ts
similarity index 92%
rename from core/gui/src/app/common/type/user.ts
rename to frontend/src/app/common/type/user.ts
index 01c7b8c4b16..2a191d52dc5 100644
--- a/core/gui/src/app/common/type/user.ts
+++ b/frontend/src/app/common/type/user.ts
@@ -22,10 +22,8 @@ import { Point } from "../../workspace/types/workflow-common.interface";
 /**
  * This interface stores the information about the user account.
  * Such information is used to identify users and to save their data
- * Corresponds to `core/amber/src/main/scala/edu/uci/ics/texera/web/resource/auth/UserResource.scala`
+ * Corresponds to `amber/src/main/scala/org/apache/texera/web/resource/auth/UserResource.scala`
  */
-
-// Please check Role at \core\amber\src\main\scala\edu\uci\ics\texera\web\model\jooq\generated\enums\UserRole.java
 export enum Role {
   INACTIVE = "INACTIVE",
   RESTRICTED = "RESTRICTED",
@@ -48,6 +46,7 @@ export interface User
     comment: string;
     lastLogin?: number;
     accountCreation?: Second;
+    affiliation?: string;
   }> {}
 
 export interface File
diff --git a/core/gui/src/app/common/type/workflow.ts b/frontend/src/app/common/type/workflow.ts
similarity index 96%
rename from core/gui/src/app/common/type/workflow.ts
rename to frontend/src/app/common/type/workflow.ts
index c6bb80b6174..6792df9d7d0 100644
--- a/core/gui/src/app/common/type/workflow.ts
+++ b/frontend/src/app/common/type/workflow.ts
@@ -18,7 +18,7 @@
  */
 
 import { WorkflowMetadata } from "../../dashboard/type/workflow-metadata.interface";
-import { OperatorLink, OperatorPredicate, Point, CommentBox } from "../../workspace/types/workflow-common.interface";
+import { CommentBox, OperatorLink, OperatorPredicate, Point } from "../../workspace/types/workflow-common.interface";
 
 export interface WorkflowSettings {
   dataTransferBatchSize: number;
diff --git a/frontend/src/app/common/util/array-utils.ts b/frontend/src/app/common/util/array-utils.ts
new file mode 100644
index 00000000000..e65bc76d496
--- /dev/null
+++ b/frontend/src/app/common/util/array-utils.ts
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Immutable helpers for array updates.
+ */
+
+// Returns a array with an element edited (original array not mutated)
+export function replaceOneImmutable<T>(
+  arr: ReadonlyArray<T>,
+  predicate: (t: T, idx: number) => boolean,
+  item: T
+): ReadonlyArray<T> {
+  const idx = arr.findIndex(predicate);
+  if (idx < 0) return arr;
+  const next = arr.slice();
+  (next as T[])[idx] = item;
+  return next;
+}
diff --git a/core/gui/src/app/common/util/assert.ts b/frontend/src/app/common/util/assert.ts
similarity index 100%
rename from core/gui/src/app/common/util/assert.ts
rename to frontend/src/app/common/util/assert.ts
diff --git a/core/gui/src/app/common/util/context.ts b/frontend/src/app/common/util/context.ts
similarity index 100%
rename from core/gui/src/app/common/util/context.ts
rename to frontend/src/app/common/util/context.ts
diff --git a/core/gui/src/app/common/util/error.ts b/frontend/src/app/common/util/error.ts
similarity index 100%
rename from core/gui/src/app/common/util/error.ts
rename to frontend/src/app/common/util/error.ts
diff --git a/core/gui/src/app/common/util/format.util.ts b/frontend/src/app/common/util/format.util.ts
similarity index 100%
rename from core/gui/src/app/common/util/format.util.ts
rename to frontend/src/app/common/util/format.util.ts
diff --git a/core/gui/src/app/common/util/logical-operator-port-serde.ts b/frontend/src/app/common/util/logical-operator-port-serde.ts
similarity index 100%
rename from core/gui/src/app/common/util/logical-operator-port-serde.ts
rename to frontend/src/app/common/util/logical-operator-port-serde.ts
diff --git a/core/gui/src/app/common/util/map.ts b/frontend/src/app/common/util/map.ts
similarity index 100%
rename from core/gui/src/app/common/util/map.ts
rename to frontend/src/app/common/util/map.ts
diff --git a/core/gui/src/app/common/util/panel-dock.ts b/frontend/src/app/common/util/panel-dock.ts
similarity index 100%
rename from core/gui/src/app/common/util/panel-dock.ts
rename to frontend/src/app/common/util/panel-dock.ts
diff --git a/core/gui/src/app/common/util/port-identity-serde.ts b/frontend/src/app/common/util/port-identity-serde.ts
similarity index 87%
rename from core/gui/src/app/common/util/port-identity-serde.ts
rename to frontend/src/app/common/util/port-identity-serde.ts
index 1cc2a534343..3041c7d454c 100644
--- a/core/gui/src/app/common/util/port-identity-serde.ts
+++ b/frontend/src/app/common/util/port-identity-serde.ts
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-import { PortIdentity } from "../type/proto/edu/uci/ics/amber/engine/common/workflow";
+import { PortIdentity } from "../type/proto/org/apache/texera/amber/engine/common/workflow";
 
 /**
  * Serializes a PortIdentity object to a string in the format "{isInput}-{id}-{internal}"
  * @param portIdentity The PortIdentity object to serialize
  * @returns A string representation of the PortIdentity (e.g., "1-true", "2-false")
- * This is aligned with the backend serializer: core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala
+ * This is aligned with the backend serializer: core/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeySerializer.scala
  */
 export function serializePortIdentity(portIdentity: PortIdentity): string {
   return `${portIdentity.id}_${portIdentity.internal}`;
diff --git a/core/gui/src/app/common/util/predicate.ts b/frontend/src/app/common/util/predicate.ts
similarity index 100%
rename from core/gui/src/app/common/util/predicate.ts
rename to frontend/src/app/common/util/predicate.ts
diff --git a/core/gui/src/app/common/util/set.ts b/frontend/src/app/common/util/set.ts
similarity index 100%
rename from core/gui/src/app/common/util/set.ts
rename to frontend/src/app/common/util/set.ts
diff --git a/core/gui/src/app/common/util/size-formatter.util.spec.ts b/frontend/src/app/common/util/size-formatter.util.spec.ts
similarity index 100%
rename from core/gui/src/app/common/util/size-formatter.util.spec.ts
rename to frontend/src/app/common/util/size-formatter.util.spec.ts
diff --git a/core/gui/src/app/common/util/size-formatter.util.ts b/frontend/src/app/common/util/size-formatter.util.ts
similarity index 100%
rename from core/gui/src/app/common/util/size-formatter.util.ts
rename to frontend/src/app/common/util/size-formatter.util.ts
diff --git a/core/gui/src/app/common/util/storage.ts b/frontend/src/app/common/util/storage.ts
similarity index 100%
rename from core/gui/src/app/common/util/storage.ts
rename to frontend/src/app/common/util/storage.ts
diff --git a/core/gui/src/app/common/util/stub.ts b/frontend/src/app/common/util/stub.ts
similarity index 100%
rename from core/gui/src/app/common/util/stub.ts
rename to frontend/src/app/common/util/stub.ts
diff --git a/core/gui/src/app/common/util/switch.ts b/frontend/src/app/common/util/switch.ts
similarity index 100%
rename from core/gui/src/app/common/util/switch.ts
rename to frontend/src/app/common/util/switch.ts
diff --git a/core/gui/src/app/common/util/url.ts b/frontend/src/app/common/util/url.ts
similarity index 100%
rename from core/gui/src/app/common/util/url.ts
rename to frontend/src/app/common/util/url.ts
diff --git a/core/gui/src/app/common/util/workflow-check.ts b/frontend/src/app/common/util/workflow-check.ts
similarity index 100%
rename from core/gui/src/app/common/util/workflow-check.ts
rename to frontend/src/app/common/util/workflow-check.ts
diff --git a/core/gui/src/app/common/util/workflow-compilation-utils.ts b/frontend/src/app/common/util/workflow-compilation-utils.ts
similarity index 100%
rename from core/gui/src/app/common/util/workflow-compilation-utils.ts
rename to frontend/src/app/common/util/workflow-compilation-utils.ts
diff --git a/core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.html b/frontend/src/app/dashboard/component/admin/execution/admin-execution.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.html
rename to frontend/src/app/dashboard/component/admin/execution/admin-execution.component.html
diff --git a/core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.scss b/frontend/src/app/dashboard/component/admin/execution/admin-execution.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.scss
rename to frontend/src/app/dashboard/component/admin/execution/admin-execution.component.scss
diff --git a/core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.spec.ts b/frontend/src/app/dashboard/component/admin/execution/admin-execution.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.spec.ts
rename to frontend/src/app/dashboard/component/admin/execution/admin-execution.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.ts b/frontend/src/app/dashboard/component/admin/execution/admin-execution.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/execution/admin-execution.component.ts
rename to frontend/src/app/dashboard/component/admin/execution/admin-execution.component.ts
diff --git a/core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.html b/frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.html
rename to frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.html
diff --git a/core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.scss b/frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.scss
rename to frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.scss
diff --git a/core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.ts b/frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.ts
similarity index 99%
rename from core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.ts
rename to frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.ts
index 72a0409e33c..1da28cfd713 100644
--- a/core/gui/src/app/dashboard/component/admin/gmail/admin-gmail.component.ts
+++ b/frontend/src/app/dashboard/component/admin/gmail/admin-gmail.component.ts
@@ -21,6 +21,7 @@ import { Component, OnInit } from "@angular/core";
 import { GmailService } from "../../../../common/service/gmail/gmail.service";
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
+
 @UntilDestroy()
 @Component({
   selector: "texera-gmail",
diff --git a/core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.html b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.html
rename to frontend/src/app/dashboard/component/admin/settings/admin-settings.component.html
diff --git a/core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.scss b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.scss
rename to frontend/src/app/dashboard/component/admin/settings/admin-settings.component.scss
diff --git a/core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.spec.ts b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.spec.ts
rename to frontend/src/app/dashboard/component/admin/settings/admin-settings.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.ts b/frontend/src/app/dashboard/component/admin/settings/admin-settings.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/settings/admin-settings.component.ts
rename to frontend/src/app/dashboard/component/admin/settings/admin-settings.component.ts
diff --git a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.html b/frontend/src/app/dashboard/component/admin/user/admin-user.component.html
similarity index 96%
rename from core/gui/src/app/dashboard/component/admin/user/admin-user.component.html
rename to frontend/src/app/dashboard/component/admin/user/admin-user.component.html
index 8e59e0d4c85..e3f3d5a2ec7 100644
--- a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.html
+++ b/frontend/src/app/dashboard/component/admin/user/admin-user.component.html
@@ -31,7 +31,11 @@
   [nzData]="listOfDisplayUser">
   <thead>
     <tr>
-      <th>Avatar</th>
+      <th
+        [nzSortFn]="sortByActive"
+        [nzSortDirections]="['ascend', 'descend']">
+        Avatar
+      </th>
       <th
         [nzSortFn]="sortByID"
         [nzSortDirections]="['ascend', 'descend']">
@@ -65,6 +69,7 @@
             nzType="search"></span>
         </nz-filter-trigger>
       </th>
+      <th>Affiliation</th>
       <th
         [nzSortFn]="sortByComment"
         [nzSortDirections]="['ascend', 'descend']"
@@ -92,7 +97,11 @@
         User Role
       </th>
       <th>Quota</th>
-      <th>Account Creation Time</th>
+      <th
+        [nzSortFn]="sortByAccountCreation"
+        [nzSortDirections]="['ascend', 'descend']">
+        Account Creation Time
+      </th>
     </tr>
   </thead>
   <nz-dropdown-menu #nameMenu="nzDropdownMenu">
@@ -222,6 +231,7 @@
           </ng-template>
         </div>
       </td>
+      <td>{{ user.affiliation }}</td>
       <td>
         <div (focusout)="saveEdit()">
           <ng-container *ngIf="editUid !== user.uid || editAttribute !== 'comment'; else editCommentTemplate">
diff --git a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.scss b/frontend/src/app/dashboard/component/admin/user/admin-user.component.scss
similarity index 98%
rename from core/gui/src/app/dashboard/component/admin/user/admin-user.component.scss
rename to frontend/src/app/dashboard/component/admin/user/admin-user.component.scss
index 15b89391397..f401c55405f 100644
--- a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.scss
+++ b/frontend/src/app/dashboard/component/admin/user/admin-user.component.scss
@@ -81,7 +81,7 @@
 
 :host ::ng-deep .user-avatar {
   display: inline-block;
-  border: 2.5px solid #ccc;
+  border: 4.5px solid #ccc;
   border-radius: 50%;
   padding: 2px;
   transition: border-color 0.2s ease;
diff --git a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.spec.ts b/frontend/src/app/dashboard/component/admin/user/admin-user.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/admin/user/admin-user.component.spec.ts
rename to frontend/src/app/dashboard/component/admin/user/admin-user.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.ts b/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
similarity index 79%
rename from core/gui/src/app/dashboard/component/admin/user/admin-user.component.ts
rename to frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
index 154648878dc..30545117cce 100644
--- a/core/gui/src/app/dashboard/component/admin/user/admin-user.component.ts
+++ b/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
@@ -23,10 +23,11 @@ import { NzTableFilterFn, NzTableSortFn } from "ng-zorro-antd/table";
 import { NzModalService } from "ng-zorro-antd/modal";
 import { NzMessageService } from "ng-zorro-antd/message";
 import { AdminUserService } from "../../../service/admin/user/admin-user.service";
-import { Role, User, MilliSecond } from "../../../../common/type/user";
+import { MilliSecond, Role, User } from "../../../../common/type/user";
 import { UserService } from "../../../../common/service/user/user.service";
 import { UserQuotaComponent } from "../../user/user-quota/user-quota.component";
 import { GuiConfigService } from "../../../../common/service/gui-config.service";
+import { replaceOneImmutable } from "../../../../common/util/array-utils";
 
 @UntilDestroy()
 @Component({
@@ -126,12 +127,28 @@ export class AdminUserComponent implements OnInit {
     }
 
     const currentUid = this.editUid;
+    // Edited User
+    const updatedUser: User = {
+      ...originalUser,
+      name: this.editName,
+      email: this.editEmail,
+      comment: this.editComment,
+      role: this.editRole,
+    };
+
     this.stopEdit();
+
     this.adminUserService
       .updateUser(currentUid, this.editName, this.editEmail, this.editRole, this.editComment)
       .pipe(untilDestroyed(this))
       .subscribe({
-        next: () => this.ngOnInit(),
+        next: () => {
+          // Update userList and listOfDisplayUser with updatedUser
+          this.userList = [...replaceOneImmutable(this.userList, u => u.uid === currentUid, updatedUser)];
+          this.listOfDisplayUser = [
+            ...replaceOneImmutable(this.listOfDisplayUser, u => u.uid === currentUid, updatedUser),
+          ];
+        },
         error: (err: unknown) => {
           const errorMessage = (err as any).error?.message || (err as Error).message;
           this.messageService.error(errorMessage);
@@ -145,10 +162,30 @@ export class AdminUserComponent implements OnInit {
   }
 
   public sortByID: NzTableSortFn<User> = (a: User, b: User) => b.uid - a.uid;
-  public sortByName: NzTableSortFn<User> = (a: User, b: User) => (b.name || "").localeCompare(a.name);
-  public sortByEmail: NzTableSortFn<User> = (a: User, b: User) => (b.email || "").localeCompare(a.email);
-  public sortByComment: NzTableSortFn<User> = (a: User, b: User) => (b.comment || "").localeCompare(a.comment);
-  public sortByRole: NzTableSortFn<User> = (a: User, b: User) => b.role.localeCompare(a.role);
+  public sortByName: NzTableSortFn<User> = (a: User, b: User) => {
+    const compare = (b.name || "").localeCompare(a.name || "");
+    return compare === 0 ? a.uid - b.uid : compare;
+  };
+
+  public sortByEmail: NzTableSortFn<User> = (a: User, b: User) => {
+    const compare = (b.email || "").localeCompare(a.email || "");
+    return compare === 0 ? a.uid - b.uid : compare;
+  };
+
+  public sortByComment: NzTableSortFn<User> = (a: User, b: User) => {
+    const compare = (b.comment || "").localeCompare(a.comment || "");
+    return compare === 0 ? a.uid - b.uid : compare;
+  };
+
+  public sortByRole: NzTableSortFn<User> = (a: User, b: User) => {
+    const compare = b.role.localeCompare(a.role);
+    return compare === 0 ? a.uid - b.uid : compare;
+  };
+
+  public sortByAccountCreation: NzTableSortFn<User> = (a: User, b: User) => {
+    const compare = (a.accountCreation || 0) - (b.accountCreation || 0);
+    return compare === 0 ? a.uid - b.uid : compare;
+  };
 
   reset(): void {
     this.nameSearchValue = "";
@@ -162,7 +199,8 @@ export class AdminUserComponent implements OnInit {
 
   searchByName(): void {
     this.nameSearchVisible = false;
-    this.listOfDisplayUser = this.userList.filter(user => (user.name || "").indexOf(this.nameSearchValue) !== -1);
+    const q = (this.nameSearchValue ?? "").trim().toLowerCase();
+    this.listOfDisplayUser = this.userList.filter(u => (u.name ?? "").toLowerCase().includes(q));
   }
 
   searchByEmail(): void {
@@ -203,6 +241,14 @@ export class AdminUserComponent implements OnInit {
     return user.accountCreation * 1000;
   }
 
+  sortByActive: NzTableSortFn<User> = (a: User, b: User) => {
+    const aActive = this.isUserActive(a);
+    const bActive = this.isUserActive(b);
+
+    if (aActive === bActive) return a.uid - b.uid;
+    return aActive ? -1 : 1;
+  };
+
   public filterByRole: NzTableFilterFn<User> = (list: string[], user: User) =>
     list.some(role => user.role.indexOf(role) !== -1);
 }
diff --git a/core/gui/src/app/dashboard/component/button-style.scss b/frontend/src/app/dashboard/component/button-style.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/button-style.scss
rename to frontend/src/app/dashboard/component/button-style.scss
diff --git a/core/gui/src/app/dashboard/component/dashboard.component.html b/frontend/src/app/dashboard/component/dashboard.component.html
similarity index 87%
rename from core/gui/src/app/dashboard/component/dashboard.component.html
rename to frontend/src/app/dashboard/component/dashboard.component.html
index cf490d33043..d4d3d82d706 100644
--- a/core/gui/src/app/dashboard/component/dashboard.component.html
+++ b/frontend/src/app/dashboard/component/dashboard.component.html
@@ -193,7 +193,7 @@
   </nz-sider>
 
   <div class="page-container">
-    <nz-layout>
+    <nz-layout class="page-content-layout">
       <div
         [hidden]="!displayNavbar"
         id="nav">
@@ -213,4 +213,36 @@
       </nz-content>
     </nz-layout>
   </div>
+  <nz-modal
+    [(nzVisible)]="affiliationModalVisible"
+    [nzMaskClosable]="true"
+    [nzClosable]="true"
+    (nzOnCancel)="onAffiliationCancel()"
+    nzTitle="Tell us your affiliation">
+    <ng-container *nzModalContent>
+      <p>
+        To help us understand our users better, please tell us your affiliation (for example, your university, company,
+        or organization).
+      </p>
+      <input
+        nz-input
+        [(ngModel)]="affiliationInput"
+        placeholder="e.g. UC Irvine" />
+    </ng-container>
+
+    <ng-container *nzModalFooter>
+      <button
+        nz-button
+        (click)="skipAffiliation()">
+        Skip
+      </button>
+      <button
+        nz-button
+        nzType="primary"
+        [nzLoading]="affiliationSaving"
+        (click)="saveAffiliation()">
+        Save
+      </button>
+    </ng-container>
+  </nz-modal>
 </nz-layout>
diff --git a/core/gui/src/app/dashboard/component/dashboard.component.scss b/frontend/src/app/dashboard/component/dashboard.component.scss
similarity index 90%
rename from core/gui/src/app/dashboard/component/dashboard.component.scss
rename to frontend/src/app/dashboard/component/dashboard.component.scss
index a7fd800e5a6..e327718ca13 100644
--- a/core/gui/src/app/dashboard/component/dashboard.component.scss
+++ b/frontend/src/app/dashboard/component/dashboard.component.scss
@@ -50,7 +50,19 @@ button {
 
 .ant-layout-content {
   background-color: white;
-  border: 1px solid #f0f0f0;
+}
+
+.page-content-layout {
+  border-left: 1px solid #f0f0f0;
+}
+
+.ant-layout-sider-has-trigger {
+  border-right: none;
+}
+
+.ant-menu-inline,
+.ant-menu-inline-collapsed {
+  border: none;
 }
 
 .ant-menu {
@@ -74,6 +86,7 @@ button {
 
 nz-content {
   position: relative;
+  overflow-y: auto;
 }
 
 .page-container {
diff --git a/core/gui/src/app/dashboard/component/dashboard.component.spec.ts b/frontend/src/app/dashboard/component/dashboard.component.spec.ts
similarity index 95%
rename from core/gui/src/app/dashboard/component/dashboard.component.spec.ts
rename to frontend/src/app/dashboard/component/dashboard.component.spec.ts
index 60f27dc0c39..508baf44076 100644
--- a/core/gui/src/app/dashboard/component/dashboard.component.spec.ts
+++ b/frontend/src/app/dashboard/component/dashboard.component.spec.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { TestBed, ComponentFixture } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { DashboardComponent } from "./dashboard.component";
-import { NO_ERRORS_SCHEMA, ChangeDetectorRef, NgZone, EventEmitter } from "@angular/core";
+import { ChangeDetectorRef, EventEmitter, NgZone, NO_ERRORS_SCHEMA } from "@angular/core";
 import { By } from "@angular/platform-browser";
 import { of } from "rxjs";
 
@@ -27,15 +27,15 @@ import { UserService } from "../../common/service/user/user.service";
 import { FlarumService } from "../service/user/flarum/flarum.service";
 import { SocialAuthService } from "@abacritt/angularx-social-login";
 import {
-  Router,
-  NavigationEnd,
   ActivatedRoute,
   ActivatedRouteSnapshot,
-  UrlSegment,
-  Params,
+  convertToParamMap,
   Data,
+  NavigationEnd,
+  Params,
+  Router,
+  UrlSegment,
 } from "@angular/router";
-import { convertToParamMap } from "@angular/router";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { commonTestProviders } from "../../common/testing/test-utils";
 
diff --git a/core/gui/src/app/dashboard/component/dashboard.component.ts b/frontend/src/app/dashboard/component/dashboard.component.ts
similarity index 80%
rename from core/gui/src/app/dashboard/component/dashboard.component.ts
rename to frontend/src/app/dashboard/component/dashboard.component.ts
index c07a78f7bf8..26448c88d6c 100644
--- a/core/gui/src/app/dashboard/component/dashboard.component.ts
+++ b/frontend/src/app/dashboard/component/dashboard.component.ts
@@ -32,8 +32,8 @@ import {
   DASHBOARD_ABOUT,
   DASHBOARD_ADMIN_EXECUTION,
   DASHBOARD_ADMIN_GMAIL,
-  DASHBOARD_ADMIN_USER,
   DASHBOARD_ADMIN_SETTINGS,
+  DASHBOARD_ADMIN_USER,
   DASHBOARD_USER_DATASET,
   DASHBOARD_USER_DISCUSSION,
   DASHBOARD_USER_PROJECT,
@@ -42,6 +42,7 @@ import {
 } from "../../app-routing.constant";
 import { Version } from "../../../environments/version";
 import { SidebarTabs } from "../../common/type/gui-config";
+import { User } from "../../common/type/user";
 
 @Component({
   selector: "texera-dashboard",
@@ -74,6 +75,10 @@ export class DashboardComponent implements OnInit {
     forum_enabled: false,
     about_enabled: false,
   };
+  // Variables related to updating user's affiliation
+  affiliationModalVisible = false;
+  affiliationInput: string = "";
+  affiliationSaving = false;
 
   protected readonly DASHBOARD_USER_PROJECT = DASHBOARD_USER_PROJECT;
   protected readonly DASHBOARD_USER_WORKFLOW = DASHBOARD_USER_WORKFLOW;
@@ -114,11 +119,12 @@ export class DashboardComponent implements OnInit {
     this.userService
       .userChanged()
       .pipe(untilDestroyed(this))
-      .subscribe(() => {
+      .subscribe(user => {
         this.ngZone.run(() => {
           this.isLogin = this.userService.isLogin();
           this.isAdmin = this.userService.isAdmin();
           this.forumLogin();
+          this.checkAffiliationPrompt(user);
           this.cdr.detectChanges();
         });
       });
@@ -194,6 +200,67 @@ export class DashboardComponent implements OnInit {
     }
   }
 
+  /**
+   * Prompts user to enter affiliation if they have not been prompted before
+   * @param user
+   */
+  checkAffiliationPrompt(user: User | undefined): void {
+    // Null affiliation = never prompted before
+    if (!user || !this.config.env.googleLogin) {
+      return;
+    }
+
+    this.userService
+      .checkAffiliation()
+      .pipe(untilDestroyed(this))
+      .subscribe(response => {
+        if (response) {
+          this.affiliationInput = "";
+          this.affiliationModalVisible = true;
+        } else {
+          this.affiliationModalVisible = false;
+        }
+      });
+  }
+
+  /**
+   * Saves the affiliation
+   */
+  saveAffiliation(): void {
+    const value = this.affiliationInput?.trim() ?? "";
+    this.affiliationSaving = true;
+
+    this.userService
+      .updateAffiliation(value)
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        next: () => {
+          this.affiliationSaving = false;
+          this.affiliationModalVisible = false;
+        },
+        error: () => {
+          this.affiliationSaving = false;
+          this.affiliationModalVisible = false;
+        },
+      });
+  }
+
+  /**
+   * Skips the affiliation input and update the database to store an empty string, which means the user has
+   * already been prompted.
+   */
+  skipAffiliation(): void {
+    this.affiliationInput = "";
+    this.saveAffiliation();
+  }
+
+  /**
+   * Skips the affiliation input when user closed the prompt window via outside click, ESC
+   */
+  onAffiliationCancel(): void {
+    this.skipAffiliation();
+  }
+
   checkRoute() {
     const currentRoute = this.router.url;
     this.displayNavbar = this.isNavbarEnabled(currentRoute);
diff --git a/core/gui/src/app/dashboard/component/section-style.scss b/frontend/src/app/dashboard/component/section-style.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/section-style.scss
rename to frontend/src/app/dashboard/component/section-style.scss
diff --git a/core/gui/src/app/dashboard/component/user-dashboard-test-fixtures.ts b/frontend/src/app/dashboard/component/user-dashboard-test-fixtures.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user-dashboard-test-fixtures.ts
rename to frontend/src/app/dashboard/component/user-dashboard-test-fixtures.ts
diff --git a/core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.html b/frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.html
rename to frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.html
diff --git a/core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.scss b/frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.scss
rename to frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts b/frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts
similarity index 95%
rename from core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts
rename to frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts
index 50aabb2648d..0fbd00a3579 100644
--- a/core/gui/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts
+++ b/frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts
@@ -17,14 +17,10 @@
  * under the License.
  */
 
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { FileUploadItem } from "../../../type/dashboard-file.interface";
 import { NgxFileDropEntry } from "ngx-file-drop";
-import {
-  DatasetVersionFileTreeManager,
-  DatasetFileNode,
-  getPathsUnderOrEqualDatasetFileNode,
-} from "../../../../common/type/datasetVersionFileTree";
+import { DatasetFileNode } from "../../../../common/type/datasetVersionFileTree";
 import { NotificationService } from "../../../../common/service/notification/notification.service";
 import { AdminSettingsService } from "../../../service/admin/settings/admin-settings.service";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
diff --git a/core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.html b/frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.html
rename to frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.html
diff --git a/core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.spec.ts b/frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.spec.ts
rename to frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.ts b/frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.ts
similarity index 95%
rename from core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.ts
rename to frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.ts
index 3fdd926682a..5662c64d164 100644
--- a/core/gui/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.ts
+++ b/frontend/src/app/dashboard/component/user/filters-instructions/filters-instructions.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component, OnInit } from "@angular/core";
+import { Component } from "@angular/core";
 
 @Component({
   selector: "texera-filters-instructions",
diff --git a/core/gui/src/app/dashboard/component/user/filters/filters.component.html b/frontend/src/app/dashboard/component/user/filters/filters.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/filters/filters.component.html
rename to frontend/src/app/dashboard/component/user/filters/filters.component.html
diff --git a/core/gui/src/app/dashboard/component/user/filters/filters.component.scss b/frontend/src/app/dashboard/component/user/filters/filters.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/filters/filters.component.scss
rename to frontend/src/app/dashboard/component/user/filters/filters.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/filters/filters.component.spec.ts b/frontend/src/app/dashboard/component/user/filters/filters.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/filters/filters.component.spec.ts
rename to frontend/src/app/dashboard/component/user/filters/filters.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/filters/filters.component.ts b/frontend/src/app/dashboard/component/user/filters/filters.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/filters/filters.component.ts
rename to frontend/src/app/dashboard/component/user/filters/filters.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/flarum/flarum.component.html b/frontend/src/app/dashboard/component/user/flarum/flarum.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/flarum/flarum.component.html
rename to frontend/src/app/dashboard/component/user/flarum/flarum.component.html
diff --git a/core/gui/src/app/dashboard/component/user/flarum/flarum.component.ts b/frontend/src/app/dashboard/component/user/flarum/flarum.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/flarum/flarum.component.ts
rename to frontend/src/app/dashboard/component/user/flarum/flarum.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/list-item/list-item.component.html b/frontend/src/app/dashboard/component/user/list-item/list-item.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/list-item/list-item.component.html
rename to frontend/src/app/dashboard/component/user/list-item/list-item.component.html
diff --git a/core/gui/src/app/dashboard/component/user/list-item/list-item.component.scss b/frontend/src/app/dashboard/component/user/list-item/list-item.component.scss
similarity index 97%
rename from core/gui/src/app/dashboard/component/user/list-item/list-item.component.scss
rename to frontend/src/app/dashboard/component/user/list-item/list-item.component.scss
index 21006d20a66..9c81256ec80 100644
--- a/core/gui/src/app/dashboard/component/user/list-item/list-item.component.scss
+++ b/frontend/src/app/dashboard/component/user/list-item/list-item.component.scss
@@ -193,3 +193,7 @@
 .liked {
   color: red;
 }
+
+:host ::ng-deep nz-card.list-item-card.ant-card:hover .ant-card-body {
+  cursor: pointer;
+}
diff --git a/core/gui/src/app/dashboard/component/user/list-item/list-item.component.spec.ts b/frontend/src/app/dashboard/component/user/list-item/list-item.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/list-item/list-item.component.spec.ts
rename to frontend/src/app/dashboard/component/user/list-item/list-item.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/list-item/list-item.component.ts b/frontend/src/app/dashboard/component/user/list-item/list-item.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/list-item/list-item.component.ts
rename to frontend/src/app/dashboard/component/user/list-item/list-item.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.html b/frontend/src/app/dashboard/component/user/search-bar/search-bar.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.html
rename to frontend/src/app/dashboard/component/user/search-bar/search-bar.component.html
diff --git a/core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.scss b/frontend/src/app/dashboard/component/user/search-bar/search-bar.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.scss
rename to frontend/src/app/dashboard/component/user/search-bar/search-bar.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.ts b/frontend/src/app/dashboard/component/user/search-bar/search-bar.component.ts
similarity index 98%
rename from core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.ts
rename to frontend/src/app/dashboard/component/user/search-bar/search-bar.component.ts
index 38d992fc8c6..4f19e3c5e75 100644
--- a/core/gui/src/app/dashboard/component/user/search-bar/search-bar.component.ts
+++ b/frontend/src/app/dashboard/component/user/search-bar/search-bar.component.ts
@@ -25,7 +25,7 @@ import { SortMethod } from "../../../type/sort-method";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { SearchResult, SearchResultItem } from "../../../type/search-result";
 import { DashboardEntry } from "../../../type/dashboard-entry";
-import { Subject, Observable, of } from "rxjs";
+import { Observable, of, Subject } from "rxjs";
 import { debounceTime, switchMap } from "rxjs/operators";
 import { UserService } from "../../../../common/service/user/user.service";
 import { DASHBOARD_SEARCH } from "../../../../app-routing.constant";
diff --git a/core/gui/src/app/dashboard/component/user/search-results/search-results.component.html b/frontend/src/app/dashboard/component/user/search-results/search-results.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/search-results/search-results.component.html
rename to frontend/src/app/dashboard/component/user/search-results/search-results.component.html
diff --git a/core/gui/src/app/dashboard/component/user/search-results/search-results.component.scss b/frontend/src/app/dashboard/component/user/search-results/search-results.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/search-results/search-results.component.scss
rename to frontend/src/app/dashboard/component/user/search-results/search-results.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/search-results/search-results.component.ts b/frontend/src/app/dashboard/component/user/search-results/search-results.component.ts
similarity index 97%
rename from core/gui/src/app/dashboard/component/user/search-results/search-results.component.ts
rename to frontend/src/app/dashboard/component/user/search-results/search-results.component.ts
index b076438172b..f120ae8adc8 100644
--- a/core/gui/src/app/dashboard/component/user/search-results/search-results.component.ts
+++ b/frontend/src/app/dashboard/component/user/search-results/search-results.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { DashboardEntry } from "../../../type/dashboard-entry";
 import { UserService } from "../../../../common/service/user/user.service";
 
diff --git a/core/gui/src/app/dashboard/component/user/search/search.component.html b/frontend/src/app/dashboard/component/user/search/search.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/search/search.component.html
rename to frontend/src/app/dashboard/component/user/search/search.component.html
diff --git a/core/gui/src/app/dashboard/component/user/search/search.component.scss b/frontend/src/app/dashboard/component/user/search/search.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/search/search.component.scss
rename to frontend/src/app/dashboard/component/user/search/search.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/search/search.component.ts b/frontend/src/app/dashboard/component/user/search/search.component.ts
similarity index 98%
rename from core/gui/src/app/dashboard/component/user/search/search.component.ts
rename to frontend/src/app/dashboard/component/user/search/search.component.ts
index 835525472d5..9904d623965 100644
--- a/core/gui/src/app/dashboard/component/user/search/search.component.ts
+++ b/frontend/src/app/dashboard/component/user/search/search.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component, AfterViewInit, ViewChild, ChangeDetectorRef } from "@angular/core";
+import { AfterViewInit, ChangeDetectorRef, Component, ViewChild } from "@angular/core";
 import { SearchService } from "../../../service/user/search.service";
 import { FiltersComponent } from "../filters/filters.component";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
diff --git a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.html b/frontend/src/app/dashboard/component/user/share-access/share-access.component.html
similarity index 98%
rename from core/gui/src/app/dashboard/component/user/share-access/share-access.component.html
rename to frontend/src/app/dashboard/component/user/share-access/share-access.component.html
index 64c7eb9d477..f181ef839d5 100644
--- a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.html
+++ b/frontend/src/app/dashboard/component/user/share-access/share-access.component.html
@@ -115,9 +115,7 @@
     <br />
 
     <nz-card nzTitle="Share">
-      <div
-        style="height: 50px"
-        *ngIf="type !== 'computing-unit'">
+      <div style="height: 50px">
         Access Level:
         <select formControlName="accessLevel">
           <option value="READ">read</option>
diff --git a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.scss b/frontend/src/app/dashboard/component/user/share-access/share-access.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/share-access/share-access.component.scss
rename to frontend/src/app/dashboard/component/user/share-access/share-access.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.ts b/frontend/src/app/dashboard/component/user/share-access/share-access.component.ts
similarity index 99%
rename from core/gui/src/app/dashboard/component/user/share-access/share-access.component.ts
rename to frontend/src/app/dashboard/component/user/share-access/share-access.component.ts
index 5726a6e6a44..9b7e5be175b 100644
--- a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.ts
+++ b/frontend/src/app/dashboard/component/user/share-access/share-access.component.ts
@@ -18,7 +18,7 @@
  */
 
 import { Component, EventEmitter, inject, OnDestroy, OnInit, Output } from "@angular/core";
-import { FormBuilder, FormGroup, Validators, FormControl } from "@angular/forms";
+import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms";
 import { ShareAccessService } from "../../../service/user/share-access/share-access.service";
 import { ShareAccess } from "../../../type/share-access.interface";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
diff --git a/core/gui/src/app/dashboard/component/user/sort-button/sort-button.component.html b/frontend/src/app/dashboard/component/user/sort-button/sort-button.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/sort-button/sort-button.component.html
rename to frontend/src/app/dashboard/component/user/sort-button/sort-button.component.html
diff --git a/core/gui/src/app/dashboard/component/user/sort-button/sort-button.component.scss b/frontend/src/app/dashboard/component/user/sort-button/sort-button.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/sort-button/sort-button.component.scss
rename to frontend/src/app/dashboard/component/user/sort-button/sort-button.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/sort-button/sort-button.component.ts b/frontend/src/app/dashboard/component/user/sort-button/sort-button.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/sort-button/sort-button.component.ts
rename to frontend/src/app/dashboard/component/user/sort-button/sort-button.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.html b/frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.html
rename to frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.scss b/frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.scss
rename to frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.spec.ts b/frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.ts b/frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.ts
similarity index 99%
rename from core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.ts
rename to frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.ts
index 0100a5726f3..e5f0dd7ed5a 100644
--- a/core/gui/src/app/dashboard/component/user/user-avatar/user-avatar.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-avatar/user-avatar.component.ts
@@ -20,6 +20,7 @@
 import { Component, Input, OnChanges } from "@angular/core";
 import { UserService } from "../../../../common/service/user/user.service";
 import { Observable, of } from "rxjs";
+
 @Component({
   selector: "texera-user-avatar",
   templateUrl: "./user-avatar.component.html",
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html
similarity index 89%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html
index d2b01ac115a..d4dddf94f6d 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html
@@ -281,28 +281,37 @@ <h6 style="font-weight: lighter; font-size: 0.9em">Choose a Version:</h6>
             nzGhost
             class="upload-status-panels">
             <nz-collapse-panel
-              [nzHeader]="queuedCount > 0
-                  ? ('Pending: ' + queuedCount + ' file(s)')
-                  : 'Pending'">
-              <div
-                *ngIf="queuedCount > 0"
-                class="upload-progress-wrapper-pending">
+              *ngIf="queuedCount > 0"
+              [nzHeader]="'Pending: ' + queuedCount + ' file(s)'">
+              <div class="upload-progress-wrapper-pending">
                 <div
                   *ngFor="let fileName of queuedFileNames"
                   class="upload-progress-container">
                   <span>{{ fileName }}</span>
+                  <button
+                    nz-button
+                    nzType="text"
+                    nzShape="circle"
+                    nz-tooltip
+                    [nzTooltipTitle]="'Remove from queue'"
+                    (click)="cancelExistingUpload(fileName)">
+                    <span
+                      nz-icon
+                      nzType="close"
+                      nzTheme="outline"></span>
+                  </button>
                 </div>
               </div>
             </nz-collapse-panel>
-            <nz-divider class="section-divider"></nz-divider>
+
+            <nz-divider
+              class="section-divider"
+              *ngIf="queuedCount > 0"></nz-divider>
 
             <nz-collapse-panel
-              [nzHeader]="activeCount > 0
-                  ? ('Uploading: ' + activeCount + ' file(s)')
-                  : 'Uploading'">
-              <div
-                *ngIf="activeCount > 0"
-                class="upload-progress-wrapper">
+              *ngIf="activeCount > 0"
+              [nzHeader]="'Uploading: ' + activeCount + ' file(s)'">
+              <div class="upload-progress-wrapper">
                 <div
                   *ngFor="let task of uploadTasks; trackBy: trackByTask"
                   class="upload-progress-container">
@@ -346,20 +355,31 @@ <h6 style="font-weight: lighter; font-size: 0.9em">Choose a Version:</h6>
                 </div>
               </div>
             </nz-collapse-panel>
-            <nz-divider class="section-divider"></nz-divider>
+
+            <nz-divider
+              class="section-divider"
+              *ngIf="activeCount > 0"></nz-divider>
 
             <nz-collapse-panel
-              [nzHeader]="pendingChangesCount > 0
-              ? ('Finished: ' + pendingChangesCount + ' file(s)')
-              : 'Finished'"
-              [nzActive]="false">
+              *ngIf="hasAnyActivity"
+              [nzHeader]="'Finished: ' + pendingChangesCount + ' file(s)'">
               <texera-dataset-staged-objects-list
                 [uploadTimeMap]="uploadTimeMap"
                 [did]="did"
                 [userMakeChangesEvent]="userMakeChanges"
-                (stagedObjectsChanged)="onStagedObjectsUpdated($event)"></texera-dataset-staged-objects-list>
+                (stagedObjectsChanged)="onStagedObjectsUpdated($event)">
+              </texera-dataset-staged-objects-list>
             </nz-collapse-panel>
           </nz-collapse>
+
+          <texera-dataset-staged-objects-list
+            *ngIf="!hasAnyActivity"
+            [uploadTimeMap]="uploadTimeMap"
+            [did]="did"
+            [userMakeChangesEvent]="userMakeChanges"
+            (stagedObjectsChanged)="onStagedObjectsUpdated($event)">
+          </texera-dataset-staged-objects-list>
+
           <div
             *ngIf="userHasWriteAccess() && userHasPendingChanges"
             class="version-creator">
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.scss
similarity index 98%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.scss
index 0790f28358e..797ce07d6b1 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.scss
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.scss
@@ -62,6 +62,13 @@ body {
   padding: 0;
 }
 
+.right-sider {
+  height: 100%;
+  overflow-y: auto;
+  position: relative;
+  z-index: 0;
+}
+
 .sider-resize-line {
   height: 100%;
   width: 5px;
@@ -185,7 +192,6 @@ nz-select {
 .upload-progress-wrapper-pending {
   display: flex;
   flex-direction: column;
-  gap: 10px;
   max-height: 15vh;
 }
 
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts
similarity index 78%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts
index f2559babf60..bfc97379ecd 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts
@@ -38,14 +38,15 @@ import { ActionType, EntityType, HubService, LikedStatus } from "../../../../../
 import { FileUploadItem } from "../../../../type/dashboard-file.interface";
 import { DatasetStagedObject } from "../../../../../common/type/dataset-staged-object";
 import { NzModalService } from "ng-zorro-antd/modal";
-import { UserDatasetVersionCreatorComponent } from "./user-dataset-version-creator/user-dataset-version-creator.component";
 import { AdminSettingsService } from "../../../../service/admin/settings/admin-settings.service";
-import { HttpErrorResponse } from "@angular/common/http";
+import { HttpErrorResponse, HttpStatusCode } from "@angular/common/http";
 import { Subscription } from "rxjs";
 import { formatSpeed, formatTime } from "src/app/common/util/format.util";
 import { format } from "date-fns";
 
 export const THROTTLE_TIME_MS = 1000;
+export const ABORT_RETRY_MAX_ATTEMPTS = 10;
+export const ABORT_RETRY_BACKOFF_BASE_MS = 100;
 
 @UntilDestroy()
 @Component({
@@ -406,107 +407,107 @@ export class DatasetDetailComponent implements OnInit {
     if (this.did) {
       files.forEach(file => {
         // Check if currently uploading
-        this.cancelExistingUpload(file.name);
-
-        // Create upload function
-        const startUpload = () => {
-          this.pendingQueue = this.pendingQueue.filter(item => item.fileName !== file.name);
-
-          // Add an initializing task placeholder to uploadTasks
-          this.uploadTasks.unshift({
-            filePath: file.name,
-            percentage: 0,
-            status: "initializing",
-            uploadId: "",
-            physicalAddress: "",
-          });
-          // Start multipart upload
-          const subscription = this.datasetService
-            .multipartUpload(
-              this.ownerEmail,
-              this.datasetName,
-              file.name,
-              file.file,
-              this.chunkSizeMiB * 1024 * 1024,
-              this.maxConcurrentChunks
-            )
-            .pipe(untilDestroyed(this))
-            .subscribe({
-              next: progress => {
-                // Find the task
-                const taskIndex = this.uploadTasks.findIndex(t => t.filePath === file.name);
-
-                if (taskIndex !== -1) {
-                  // Update the task with new progress info
-                  this.uploadTasks[taskIndex] = {
-                    ...this.uploadTasks[taskIndex],
-                    ...progress,
-                    percentage: progress.percentage ?? this.uploadTasks[taskIndex].percentage ?? 0,
-                  };
-
-                  // Auto-hide when upload is truly finished
-                  if (progress.status === "finished" && progress.totalTime) {
-                    const filename = file.name.split("/").pop() || file.name;
-                    this.uploadTimeMap.set(filename, progress.totalTime);
+        const continueWithUpload = () => {
+          // Create upload function
+          const startUpload = () => {
+            this.pendingQueue = this.pendingQueue.filter(item => item.fileName !== file.name);
+
+            // Add an initializing task placeholder to uploadTasks
+            this.uploadTasks.unshift({
+              filePath: file.name,
+              percentage: 0,
+              status: "initializing",
+            });
+            // Start multipart upload
+            const subscription = this.datasetService
+              .multipartUpload(
+                this.ownerEmail,
+                this.datasetName,
+                file.name,
+                file.file,
+                this.chunkSizeMiB * 1024 * 1024,
+                this.maxConcurrentChunks
+              )
+              .pipe(untilDestroyed(this))
+              .subscribe({
+                next: progress => {
+                  // Find the task
+                  const taskIndex = this.uploadTasks.findIndex(t => t.filePath === file.name);
+
+                  if (taskIndex !== -1) {
+                    // Update the task with new progress info
+                    this.uploadTasks[taskIndex] = {
+                      ...this.uploadTasks[taskIndex],
+                      ...progress,
+                      percentage: progress.percentage ?? this.uploadTasks[taskIndex].percentage ?? 0,
+                    };
+
+                    // Auto-hide when upload is truly finished
+                    if (progress.status === "finished" && progress.totalTime) {
+                      const filename = file.name.split("/").pop() || file.name;
+                      this.uploadTimeMap.set(filename, progress.totalTime);
+                      this.userMakeChanges.emit();
+                      this.scheduleHide(taskIndex);
+                      this.onUploadComplete();
+                    }
+                  }
+                },
+                error: () => {
+                  // Handle upload error
+                  const taskIndex = this.uploadTasks.findIndex(t => t.filePath === file.name);
+
+                  if (taskIndex !== -1) {
+                    this.uploadTasks[taskIndex] = {
+                      ...this.uploadTasks[taskIndex],
+                      percentage: 100,
+                      status: "aborted",
+                    };
+                    this.scheduleHide(taskIndex);
+                  }
+                  this.onUploadComplete();
+                },
+                complete: () => {
+                  const taskIndex = this.uploadTasks.findIndex(t => t.filePath === file.name);
+                  if (taskIndex !== -1 && this.uploadTasks[taskIndex].status !== "finished") {
+                    this.uploadTasks[taskIndex].status = "finished";
                     this.userMakeChanges.emit();
                     this.scheduleHide(taskIndex);
                     this.onUploadComplete();
                   }
-                }
-              },
-              error: () => {
-                // Handle upload error
-                const taskIndex = this.uploadTasks.findIndex(t => t.filePath === file.name);
-
-                if (taskIndex !== -1) {
-                  this.uploadTasks[taskIndex] = {
-                    ...this.uploadTasks[taskIndex],
-                    percentage: 100,
-                    status: "aborted",
-                  };
-                  this.scheduleHide(taskIndex);
-                }
-                this.onUploadComplete();
-              },
-              complete: () => {
-                const taskIndex = this.uploadTasks.findIndex(t => t.filePath === file.name);
-                if (taskIndex !== -1 && this.uploadTasks[taskIndex].status !== "finished") {
-                  this.uploadTasks[taskIndex].status = "finished";
-                  this.userMakeChanges.emit();
-                  this.scheduleHide(taskIndex);
-                  this.onUploadComplete();
-                }
-              },
-            });
-          // Store the subscription for later cleanup
-          this.uploadSubscriptions.set(file.name, subscription);
+                },
+              });
+            // Store the subscription for later cleanup
+            this.uploadSubscriptions.set(file.name, subscription);
+          };
+
+          // Queue management
+          if (this.activeUploads < this.maxConcurrentFiles) {
+            this.activeUploads++;
+            startUpload();
+          } else {
+            this.pendingQueue.push({ fileName: file.name, startUpload });
+          }
         };
 
-        // Queue management
-        if (this.activeUploads < this.maxConcurrentFiles) {
-          this.activeUploads++;
-          startUpload();
-        } else {
-          this.pendingQueue.push({ fileName: file.name, startUpload });
-        }
+        // Check if currently uploading
+        this.cancelExistingUpload(file.name, continueWithUpload);
       });
     }
   }
 
-  private cancelExistingUpload(fileName: string): void {
-    const isUploading = this.uploadTasks.some(
-      t => t.filePath === fileName && (t.status === "uploading" || t.status === "initializing")
-    );
-    this.uploadSubscriptions.get(fileName)?.unsubscribe();
-    this.uploadSubscriptions.delete(fileName);
-    this.uploadTasks = this.uploadTasks.filter(t => t.filePath !== fileName);
-
-    // Process next in queue if this was active
-    if (isUploading) {
-      this.onUploadComplete();
+  cancelExistingUpload(fileName: string, onCanceled?: () => void): void {
+    const task = this.uploadTasks.find(t => t.filePath === fileName);
+    if (task) {
+      if (task.status === "uploading" || task.status === "initializing") {
+        this.onClickAbortUploadProgress(task, onCanceled);
+        return;
+      }
     }
     // Remove from pending queue if present
     this.pendingQueue = this.pendingQueue.filter(item => item.fileName !== fileName);
+    if (onCanceled) {
+      onCanceled();
+    }
   }
 
   private processNextQueuedUpload(): void {
@@ -536,6 +537,10 @@ export class DatasetDetailComponent implements OnInit {
     return this.activeUploads;
   }
 
+  get hasAnyActivity(): boolean {
+    return this.pendingChangesCount > 0 || this.activeCount > 0 || this.queuedCount > 0;
+  }
+
   // Hide a task row after 5s
   private scheduleHide(idx: number) {
     if (idx === -1) {
@@ -548,7 +553,7 @@ export class DatasetDetailComponent implements OnInit {
     }, 5000);
   }
 
-  onClickAbortUploadProgress(task: MultipartUploadProgress & { filePath: string }) {
+  onClickAbortUploadProgress(task: MultipartUploadProgress & { filePath: string }, onAborted?: () => void) {
     const subscription = this.uploadSubscriptions.get(task.filePath);
     if (subscription) {
       subscription.unsubscribe();
@@ -559,21 +564,54 @@ export class DatasetDetailComponent implements OnInit {
       this.onUploadComplete();
     }
 
-    this.datasetService
-      .finalizeMultipartUpload(
-        this.ownerEmail,
-        this.datasetName,
-        task.filePath,
-        task.uploadId,
-        [],
-        task.physicalAddress,
-        true // abort flag
-      )
-      .pipe(untilDestroyed(this))
-      .subscribe(() => {
-        this.notificationService.info(`${task.filePath} uploading has been terminated`);
-      });
-    // Remove the aborted task immediately
+    let doneCalled = false;
+    const done = () => {
+      if (doneCalled) {
+        return;
+      }
+      doneCalled = true;
+      if (onAborted) {
+        onAborted();
+      }
+    };
+
+    const abortWithRetry = (attempt: number) => {
+      this.datasetService
+        .finalizeMultipartUpload(
+          this.ownerEmail,
+          this.datasetName,
+          task.filePath,
+          true // abort flag
+        )
+        .pipe(untilDestroyed(this))
+        .subscribe({
+          next: () => {
+            this.notificationService.info(`${task.filePath} uploading has been terminated`);
+            done();
+          },
+          error: (res: unknown) => {
+            const err = res as HttpErrorResponse;
+
+            // Already gone, treat as done
+            if (err.status === 404) {
+              done();
+              return;
+            }
+
+            // Backend is still finalizing/aborting; retry with a tiny backoff
+            if (err.status === HttpStatusCode.Conflict && attempt < ABORT_RETRY_MAX_ATTEMPTS) {
+              setTimeout(() => abortWithRetry(attempt + 1), ABORT_RETRY_BACKOFF_BASE_MS * (attempt + 1));
+              return;
+            }
+
+            // Keep current UX: still consider it "aborted" client-side
+            done();
+          },
+        });
+    };
+
+    abortWithRetry(0);
+
     this.uploadTasks = this.uploadTasks.filter(t => t.filePath !== task.filePath);
   }
 
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.spec.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.ts
similarity index 97%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.ts
index b56c1e6d448..e5804d260f8 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-file-renderer/user-dataset-file-renderer.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, OnDestroy } from "@angular/core";
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from "@angular/core";
 import { DatasetService } from "../../../../../service/user/dataset/dataset.service";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import * as Papa from "papaparse";
@@ -30,6 +30,8 @@ export const MIME_TYPES = {
   JPEG: "image/jpeg",
   JPG: "image/jpeg",
   PNG: "image/png",
+  WEBP: "image/webp",
+  GIF: "image/gif",
   CSV: "text/csv",
   TXT: "text/plain",
   MD: "text/markdown",
@@ -55,6 +57,8 @@ export function getMimeType(filename: string): string {
 export const MIME_TYPE_SIZE_LIMITS_MB = {
   [MIME_TYPES.JPEG]: 5 * 1024 * 1024, // 5 MB
   [MIME_TYPES.PNG]: 5 * 1024 * 1024, // 5 MB
+  [MIME_TYPES.WEBP]: 5 * 1024 * 1024, // 5 MB
+  [MIME_TYPES.GIF]: 10 * 1024 * 1024, // 10 MB
   [MIME_TYPES.CSV]: 2 * 1024 * 1024, // 2 MB for text-based data files
   [MIME_TYPES.TXT]: 1 * 1024 * 1024, // 1 MB for plain text files
   [MIME_TYPES.MD]: 1 * 1024 * 1024, // 1 MB for MD files
@@ -200,6 +204,8 @@ export class UserDatasetFileRendererComponent implements OnInit, OnChanges, OnDe
             switch (blobMimeType) {
               case MIME_TYPES.PNG:
               case MIME_TYPES.JPEG:
+              case MIME_TYPES.WEBP:
+              case MIME_TYPES.GIF:
                 this.displayImage = true;
                 this.loadSafeURL(blob);
                 break;
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html
similarity index 96%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html
index a1820dcecf1..01d21074ea9 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html
@@ -20,7 +20,8 @@
 <div class="staged-object-list-container">
   <nz-list
     nzSize="small"
-    *ngIf="datasetStagedObjects.length > 0">
+    *ngIf="datasetStagedObjects.length > 0"
+    class="custom-border-list">
     <nz-list-item *ngFor="let obj of datasetStagedObjects">
       <span>
         <nz-tag [nzColor]="obj.diffType === 'added' ? 'green' : 'red'"> {{ obj.diffType }} </nz-tag>
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss
similarity index 96%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss
index 165ea73b31d..493f1abaa32 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss
@@ -24,6 +24,10 @@
   overflow-x: auto; /* Prevents horizontal scrolling */
 }
 
+.custom-border-list {
+  border-bottom: 1px solid #f0f0f0;
+}
+
 .truncate-file-path {
   display: inline-block;
   max-width: 250px; /* Adjust width as needed */
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.ts
similarity index 97%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.ts
index 5e18d198a6b..c1f9cffc352 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Component, EventEmitter, inject, Input, OnInit, Output } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { Component, inject, OnInit } from "@angular/core";
+import { FormBuilder, FormGroup } from "@angular/forms";
 import { FormlyFieldConfig } from "@ngx-formly/core";
 import { DatasetService } from "../../../../../service/user/dataset/dataset.service";
 import { Dataset } from "../../../../../../common/type/dataset";
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.ts
similarity index 95%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.ts
index 94e8c98c884..f3e3e67e1af 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-filetree/user-dataset-version-filetree.component.ts
@@ -19,7 +19,7 @@
 
 import { UntilDestroy } from "@ngneat/until-destroy";
 import { AfterViewInit, Component, EventEmitter, Input, Output, ViewChild } from "@angular/core";
-import { DatasetFileNode, getFullPathFromDatasetFileNode } from "../../../../../../common/type/datasetVersionFileTree";
+import { DatasetFileNode } from "../../../../../../common/type/datasetVersionFileTree";
 import { ITreeOptions, TREE_ACTIONS } from "@ali-hm/angular-tree-component";
 
 @UntilDestroy()
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset-list-item/user-dataset-list-item.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.html b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.html
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.scss b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.scss
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.ts b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.ts
similarity index 94%
rename from core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.ts
rename to frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.ts
index 0626effd43b..2957e499ba6 100644
--- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-dataset/user-dataset.component.ts
@@ -24,14 +24,12 @@ import { Router } from "@angular/router";
 import { SearchService } from "../../../service/user/search.service";
 import { DatasetService } from "../../../service/user/dataset/dataset.service";
 import { SortMethod } from "../../../type/sort-method";
-import { DashboardEntry, UserInfo } from "../../../type/dashboard-entry";
+import { DashboardEntry } from "../../../type/dashboard-entry";
 import { SearchResultsComponent } from "../search-results/search-results.component";
 import { FiltersComponent } from "../filters/filters.component";
 import { firstValueFrom } from "rxjs";
-import { DASHBOARD_USER_DATASET, DASHBOARD_USER_DATASET_CREATE } from "../../../../app-routing.constant";
+import { DASHBOARD_USER_DATASET } from "../../../../app-routing.constant";
 import { NzModalService } from "ng-zorro-antd/modal";
-import { FileSelectionComponent } from "../../../../workspace/component/file-selection/file-selection.component";
-import { DatasetFileNode, getFullPathFromDatasetFileNode } from "../../../../common/type/datasetVersionFileTree";
 import { UserDatasetVersionCreatorComponent } from "./user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component";
 import { DashboardDataset } from "../../../type/dashboard-dataset.interface";
 import { NzMessageService } from "ng-zorro-antd/message";
diff --git a/core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.html b/frontend/src/app/dashboard/component/user/user-icon/user-icon.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.html
rename to frontend/src/app/dashboard/component/user/user-icon/user-icon.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.scss b/frontend/src/app/dashboard/component/user/user-icon/user-icon.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.scss
rename to frontend/src/app/dashboard/component/user/user-icon/user-icon.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.spec.ts b/frontend/src/app/dashboard/component/user/user-icon/user-icon.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-icon/user-icon.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.ts b/frontend/src/app/dashboard/component/user/user-icon/user-icon.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-icon/user-icon.component.ts
rename to frontend/src/app/dashboard/component/user/user-icon/user-icon.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/public-project/public-project.component.html b/frontend/src/app/dashboard/component/user/user-project/public-project/public-project.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/public-project/public-project.component.html
rename to frontend/src/app/dashboard/component/user/user-project/public-project/public-project.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-project/public-project/public-project.component.ts b/frontend/src/app/dashboard/component/user/user-project/public-project/public-project.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/public-project/public-project.component.ts
rename to frontend/src/app/dashboard/component/user/user-project/public-project/public-project.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.html b/frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.html
rename to frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.scss b/frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.scss
rename to frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.spec.ts b/frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.ts b/frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.ts
rename to frontend/src/app/dashboard/component/user/user-project/user-project-list-item/user-project-list-item.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.html b/frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.html
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.scss b/frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.scss
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.ts b/frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.ts
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-add-project-workflow/ngbd-modal-add-project-workflow.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.html b/frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.html
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.scss b/frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.scss
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.ts b/frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.ts
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/ngbd-modal-remove-project-workflow/ngbd-modal-remove-project-workflow.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.html b/frontend/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.html
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.scss b/frontend/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.scss
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.ts b/frontend/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.ts
rename to frontend/src/app/dashboard/component/user/user-project/user-project-section/user-project-section.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project.component.html b/frontend/src/app/dashboard/component/user/user-project/user-project.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project.component.html
rename to frontend/src/app/dashboard/component/user/user-project/user-project.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project.component.scss b/frontend/src/app/dashboard/component/user/user-project/user-project.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project.component.scss
rename to frontend/src/app/dashboard/component/user/user-project/user-project.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-project/user-project.component.ts b/frontend/src/app/dashboard/component/user/user-project/user-project.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-project/user-project.component.ts
rename to frontend/src/app/dashboard/component/user/user-project/user-project.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.html b/frontend/src/app/dashboard/component/user/user-quota/user-quota.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.html
rename to frontend/src/app/dashboard/component/user/user-quota/user-quota.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.scss b/frontend/src/app/dashboard/component/user/user-quota/user-quota.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.scss
rename to frontend/src/app/dashboard/component/user/user-quota/user-quota.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.spec.ts b/frontend/src/app/dashboard/component/user/user-quota/user-quota.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-quota/user-quota.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.ts b/frontend/src/app/dashboard/component/user/user-quota/user-quota.component.ts
similarity index 98%
rename from core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.ts
rename to frontend/src/app/dashboard/component/user/user-quota/user-quota.component.ts
index 5f7e5fdc854..d2796eca667 100644
--- a/core/gui/src/app/dashboard/component/user/user-quota/user-quota.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-quota/user-quota.component.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Component, OnInit, inject } from "@angular/core";
+import { Component, inject, OnInit } from "@angular/core";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
-import { File, Workflow, ExecutionQuota, WorkflowQuota } from "../../../../common/type/user";
+import { ExecutionQuota, File, Workflow, WorkflowQuota } from "../../../../common/type/user";
 import { DatasetQuota } from "src/app/dashboard/type/quota-statistic.interface";
 import { NzTableSortFn } from "ng-zorro-antd/table";
 import { UserQuotaService } from "src/app/dashboard/service/user/quota/user-quota.service";
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.html b/frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.html
rename to frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.scss b/frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.scss
rename to frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.ts b/frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-execution-history.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.html b/frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.html
rename to frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.scss b/frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.scss
rename to frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.ts b/frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/ngbd-modal-workflow-executions/workflow-runtime-statistics/workflow-runtime-statistics.component.ts
diff --git a/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html b/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html
new file mode 100644
index 00000000000..41603ab8e75
--- /dev/null
+++ b/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html
@@ -0,0 +1,187 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- Preview and Upload Dataset Window -->
+<div
+  class="modal-content"
+  *ngIf="popupStage === 0">
+  <!-- Left Column: Jupyter Notebook Preview -->
+  <div class="left-column">
+    <h2>Upload Successful</h2>
+    <p>Your Jupyter Notebook has been successfully uploaded!</p>
+    <h3>Notebook Preview:</h3>
+
+    <div class="notebook-preview">
+      <div
+        *ngFor="let cell of notebookContent?.cells"
+        class="notebook-cell">
+        <ng-container [ngSwitch]="cell.cell_type">
+          <!-- Markdown Cell -->
+          <div
+            *ngSwitchCase="'markdown'"
+            class="jupyter-markdown-cell">
+            <pre>{{ cell.source.join("") }}</pre>
+          </div>
+
+          <!-- Code Cell -->
+          <div
+            *ngSwitchCase="'code'"
+            class="jupyter-code-cell">
+            <pre>{{ cell.source.join("") }}</pre>
+            <!-- Safe check for outputs -->
+            <div
+              *ngIf="cell.outputs && cell.outputs.length > 0"
+              class="output">
+              <h4>Output:</h4>
+              <pre *ngFor="let output of cell.outputs">{{ getOutputText(output) }}</pre>
+            </div>
+          </div>
+
+          <!-- Raw Cell -->
+          <div
+            *ngSwitchCase="'raw'"
+            class="jupyter-raw-cell">
+            <pre>{{ cell.source.join("") }}</pre>
+          </div>
+        </ng-container>
+      </div>
+    </div>
+  </div>
+
+  <!-- Right Column: Dataset Input -->
+  <div class="right-column">
+    <h3>Select Datasets for Workflow</h3>
+    <p>Add CSV files that will be used as input datasets for the workflow execution:</p>
+    <div class="dataset-input">
+      <input
+        type="file"
+        accept=".csv"
+        (change)="onFileChange($event)"
+        multiple />
+      <ul
+        *ngIf="datasets.length > 0"
+        class="dataset-list">
+        <li *ngFor="let dataset of datasets">{{ dataset.name }}</li>
+      </ul>
+    </div>
+    <!-- Disable button when no datasets are selected -->
+    <button
+      nz-button
+      nzType="primary"
+      (click)="convertToWorkflow()"
+      [disabled]="datasets.length === 0"
+      [nzLoading]="workflowGeneratingInProgress">
+      Convert to Texera Workflow
+    </button>
+  </div>
+</div>
+
+<!-- Equivalence Check Window  -->
+<div *ngIf="popupStage === 1">
+  <h2>Notebook to Workflow Equivalence Check</h2>
+  <div class="notebook-workflow-side-by-side">
+    <div class="left-half">
+      <h3>Original Notebook</h3>
+      <div class="notebook-preview">
+        <div
+          *ngFor="let cell of notebookContent?.cells"
+          class="notebook-cell">
+          <ng-container [ngSwitch]="cell.cell_type">
+            <!-- Markdown Cell -->
+            <div
+              *ngSwitchCase="'markdown'"
+              class="jupyter-markdown-cell">
+              <pre>{{ cell.source.join("") }}</pre>
+            </div>
+
+            <!-- Code Cell -->
+            <div
+              *ngSwitchCase="'code'"
+              class="jupyter-code-cell">
+              <pre>{{ cell.source.join("") }}</pre>
+              <!-- Safe check for outputs -->
+              <div
+                *ngIf="cell.outputs && cell.outputs.length > 0"
+                class="output">
+                <h4>Output:</h4>
+                <pre *ngFor="let output of cell.outputs">{{ getOutputText(output) }}</pre>
+              </div>
+            </div>
+
+            <!-- Raw Cell -->
+            <div
+              *ngSwitchCase="'raw'"
+              class="jupyter-raw-cell">
+              <pre>{{ cell.source.join("") }}</pre>
+            </div>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+    <div class="right-half">
+      <h3>Generated Texera Workflow</h3>
+      <div class="workflow-preview">
+        <!-- TODO render workflow -->
+        {{workflowJsonContent}}
+      </div>
+    </div>
+  </div>
+  <div class="equivalence-check">
+    <button
+      nz-button
+      nzType="primary"
+      (click)="compareOutput()">
+      Compare Output
+    </button>
+  </div>
+</div>
+
+<div *ngIf="popupStage === 2">
+  <h2>Notebook to Workflow Equivalence Check</h2>
+  <div class="notebook-workflow-side-by-side">
+    <div class="left-half">
+      <h3>Original Notebook Output</h3>
+      <div class="notebook-preview">
+        <!-- TODO generate and show output -->
+        output goes here
+      </div>
+    </div>
+    <div class="right-half">
+      <h3>Generated Texera Workflow Output</h3>
+      <div class="workflow-preview">
+        <!-- TODO generate and show output -->
+        output goes here
+      </div>
+    </div>
+  </div>
+  <div class="equivalence-check">
+    <button
+      nz-button
+      nzType="primary"
+      [style.background-color]="'red'"
+      [style.margin-right]="'10px'">
+      Reject Workflow
+    </button>
+    <button
+      nz-button
+      nzType="primary">
+      Accept Workflow
+    </button>
+  </div>
+</div>
diff --git a/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss b/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss
new file mode 100644
index 00000000000..91fafb47e9c
--- /dev/null
+++ b/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss
@@ -0,0 +1,130 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.modal-content {
+  display: flex;
+  justify-content: space-between;
+  padding: 20px;
+  overflow-y: auto; // Ensure content is scrollable
+  background-color: white;
+}
+
+.left-column {
+  flex: 0 0 60%;
+  padding: 20px;
+  border-right: 1px solid #ddd;
+  overflow-y: auto; // Ensure notebook preview is scrollable
+  max-height: 100%; // Ensure content fits within modal height
+}
+
+.right-column {
+  flex: 0 0 35%;
+  padding: 20px;
+  overflow-y: auto; // Ensure dataset input section is scrollable
+}
+
+.equivalence-check {
+  display: flex;
+  justify-content: center;
+  flex-direction: row;
+}
+
+.notebook-workflow-side-by-side {
+  display: flex; /* Use flexbox for the container */
+  flex-direction: row; /* Arrange children in a row */
+  gap: 20px; /* Optional: Adds space between the columns */
+}
+
+.left-half {
+  flex: 1; /* Adjusts to take available space */
+  max-width: 50%; /* Ensures it doesn't exceed half of the container */
+}
+
+.right-half {
+  flex: 1; /* Adjusts to take available space */
+  max-width: 50%; /* Ensures it doesn't exceed half of the container */
+}
+
+.notebook-preview {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  border: 2px solid #000000;
+  padding: 10px;
+  height: 60vh; // Adjust max height for better visibility
+  overflow-y: auto;
+  background-color: #f7f7f7;
+}
+
+.workflow-preview {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  border: 2px solid #000000;
+  padding: 10px;
+  height: 60vh;
+  overflow-y: auto;
+  background-color: #f7f7f7;
+}
+
+// Styling for Jupyter Notebook Cells
+.notebook-cell {
+  margin-bottom: 20px;
+  border-radius: 5px;
+  padding: 15px;
+  background-color: white;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  position: relative;
+  border: 1px solid #e0e0e0;
+}
+
+// Markdown Cell Styles
+.jupyter-markdown-cell {
+  padding: 10px;
+  background-color: #fbfbfb;
+  font-family: "Georgia", "Times", "serif";
+  border-left: 4px solid #f1f1f1;
+}
+
+// Code Cell Styles
+.jupyter-code-cell {
+  background-color: #f7f7f7;
+  padding: 10px;
+  border-radius: 4px;
+  font-family: "Courier New", Courier, monospace;
+  border: 1px solid #ddd;
+  position: relative;
+}
+
+// Output Area Styles
+.output {
+  margin-top: 10px;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  border: 1px solid #e8e8e8;
+  font-family: "Courier New", Courier, monospace;
+  white-space: pre-wrap;
+}
+
+// Raw Cell Styles
+.jupyter-raw-cell {
+  padding: 10px;
+  background-color: #f1f1f1;
+  border: 1px dashed #ddd;
+  font-family: "Courier New", Courier, monospace;
+}
diff --git a/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts b/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts
new file mode 100644
index 00000000000..a4fe47c4e46
--- /dev/null
+++ b/frontend/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component, Input } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import { NzModalService } from "ng-zorro-antd/modal";
+import { JupyterNotebook, JupyterOutput } from "../../../../type/jupyter-notebook.interface";
+
+@Component({
+  selector: "texera-jupyter-upload-success",
+  templateUrl: "./notebook-migration.component.html",
+  styleUrls: ["./notebook-migration.component.scss"],
+})
+export class JupyterUploadSuccessComponent {
+  @Input() notebookContent!: JupyterNotebook;
+  datasets: File[] = [];
+  popupStage: number = 0; // flag to manage content display
+  workflowGeneratingInProgress: boolean = false;
+  workflowJsonContent: any; // variable to store the JSON content
+
+  constructor(
+    private http: HttpClient,
+    private modalService: NzModalService
+  ) {}
+
+  getOutputText(output: JupyterOutput): string {
+    if (output.output_type === "stream") {
+      return output.text ? output.text.join("") : "";
+    } else if (output.output_type === "execute_result" || output.output_type === "display_data") {
+      return output.data ? output.data["text/plain"] || "" : "";
+    } else if (output.output_type === "error") {
+      return output.traceback ? output.traceback.join("\n") : "";
+    }
+    return "";
+  }
+
+  onFileChange(event: any): void {
+    const files: FileList = event.target.files;
+    for (let i = 0; i < files.length; i++) {
+      this.datasets.push(files[i]);
+    }
+  }
+
+  convertToWorkflow(): void {
+    this.workflowGeneratingInProgress = true;
+
+    // Simulate workflow generation using mock data instead of an HTTP request
+    setTimeout(() => {
+      const mockData = {
+        operators: [
+          { id: "1", type: "OperatorA", properties: {} },
+          { id: "2", type: "OperatorB", properties: {} },
+        ],
+        links: [{ source: "1", target: "2" }],
+        commentBoxes: [],
+        groups: [],
+        operatorPositions: {
+          "1": { x: 100, y: 200 },
+          "2": { x: 300, y: 400 },
+        },
+      };
+
+      // Process the mock data
+      this.workflowJsonContent = mockData; // Assign mock data as workflow content
+      this.workflowGeneratingInProgress = false;
+    }, 2000); // Simulate a delay of 2 seconds for processing
+  }
+
+  /**
+   * Process the selected datasets (CSV files)
+   */
+  private processDatasets(): void {
+    if (this.datasets.length > 0) {
+      this.datasets.forEach(file => {
+        this.handleFileUploads(file);
+      });
+    }
+  }
+
+  /**
+   * Function to handle file uploads and process them (CSV dataset)
+   */
+  private handleFileUploads(file: Blob): void {
+    const reader = new FileReader();
+    reader.readAsText(file);
+    reader.onload = () => {
+      try {
+        const result = reader.result;
+        if (typeof result !== "string") {
+          throw new Error("Incorrect format: file is not a string");
+        }
+        const datasetContent = result; // Here we get the dataset content as CSV
+
+        // Handle the dataset content as needed (e.g., send it to backend or use in workflow)
+        console.log("Uploaded dataset content:", datasetContent);
+
+        // Update the workflow with dataset processing if needed
+        this.workflowJsonContent = { ...this.workflowJsonContent, datasetContent }; // Append dataset content
+
+        // Optional: Proceed to the next step or close the modal, etc.
+      } catch (error) {
+        console.error("Error processing the file: ", error);
+      }
+    };
+  }
+
+  compareOutput(): void {
+    console.log("Generating output to compare");
+    this.popupStage = 2;
+    // TODO: Implement the comparison logic here
+  }
+}
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe.ts b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe.ts
similarity index 99%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe.ts
index 59da55be370..2f302e43330 100644
--- a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe.ts
+++ b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/highlight-search-terms.pipe.ts
@@ -19,6 +19,7 @@
 
 import { Pipe, PipeTransform } from "@angular/core";
 import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
+
 @Pipe({
   name: "highlightSearchTerms",
 })
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.html b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.html
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.scss b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.scss
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.spec.ts b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.spec.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.ts b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.ts
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow-list-item/user-workflow-list-item.component.ts
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.html b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.html
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.html
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.html
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.scss b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.scss
similarity index 100%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.scss
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.scss
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.spec.ts b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.spec.ts
similarity index 99%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.spec.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.spec.ts
index 7edfcc0be83..9be5f3a834d 100644
--- a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.spec.ts
+++ b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.spec.ts
@@ -45,9 +45,9 @@ import { ScrollingModule } from "@angular/cdk/scrolling";
 import { NzAvatarModule } from "ng-zorro-antd/avatar";
 import { NzToolTipModule } from "ng-zorro-antd/tooltip";
 import {
+  mockUserInfo,
   testWorkflowEntries,
   testWorkflowFileNameConflictEntries,
-  mockUserInfo,
 } from "../../user-dashboard-test-fixtures";
 import { FiltersComponent } from "../filters/filters.component";
 import { UserWorkflowListItemComponent } from "./user-workflow-list-item/user-workflow-list-item.component";
@@ -56,11 +56,10 @@ import { StubUserProjectService } from "../../../service/user/project/stub-user-
 import { SearchService } from "../../../service/user/search.service";
 import { StubSearchService } from "../../../service/user/stub-search.service";
 import { SearchResultsComponent } from "../search-results/search-results.component";
-import { delay } from "rxjs";
+import { delay, of } from "rxjs";
 import { NzModalService } from "ng-zorro-antd/modal";
 import { NzButtonModule } from "ng-zorro-antd/button";
 import { DownloadService } from "../../../service/user/download/download.service";
-import { of } from "rxjs";
 import { commonTestProviders } from "../../../../common/testing/test-utils";
 
 describe("SavedWorkflowSectionComponent", () => {
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts
similarity index 95%
rename from core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts
rename to frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts
index 4903e70bcb4..f046abf9ab3 100644
--- a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts
+++ b/frontend/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts
@@ -45,6 +45,9 @@ import { DashboardWorkflow } from "../../../type/dashboard-workflow.interface";
 import { DownloadService } from "../../../service/user/download/download.service";
 import { DASHBOARD_USER_WORKSPACE } from "../../../../app-routing.constant";
 import { GuiConfigService } from "../../../../common/service/gui-config.service";
+import { JupyterUploadSuccessComponent } from "./notebook-migration-tool/notebook-migration.component";
+import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { environment } from "../../../../../environments/environment";
 
 /**
  * Saved-workflow-section component contains information and functionality
@@ -55,6 +58,7 @@ import { GuiConfigService } from "../../../../common/service/gui-config.service"
  *  - allows easy searching for workflows by name or other parameters using Fuse.js
  *  - sorting options
  *  - creation of a new workflow
+ *  - AI generation of new workflow from jupyter notebook
  *
  * Steps to add new search parameter:
  *  1. Add a newly formatted dropdown menu in the html and css files, and a backend call to retrieve any necessary data
@@ -120,7 +124,8 @@ export class UserWorkflowComponent implements AfterViewInit {
     private router: Router,
     private downloadService: DownloadService,
     private searchService: SearchService,
-    private config: GuiConfigService
+    private config: GuiConfigService,
+    private http: HttpClient
   ) {
     this.userService
       .userChanged()
@@ -328,6 +333,26 @@ export class UserWorkflowComponent implements AfterViewInit {
     if (entry.workflow.workflow.wid == undefined) {
       return;
     }
+
+    // Store wid, mapping, and notebook in migration database
+    const dbAPIUrl = `${environment.notebookMigrationFastAPIUrl}/postgres/delete_by_wid`;
+    const headers = new HttpHeaders({ "Content-Type": "application/json" });
+    const payload = {
+      wid: entry.workflow.workflow.wid,
+    };
+
+    this.http
+      .post(dbAPIUrl, payload, { headers })
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        next: (response: any) => {
+          console.log("Migration database:", response?.message);
+        },
+        error: (error: unknown) => {
+          console.error("Network response was not ok", error);
+        },
+      });
+
     this.workflowPersistService
       .deleteWorkflow([entry.workflow.workflow.wid])
       .pipe(untilDestroyed(this))
diff --git a/core/gui/src/app/dashboard/service/admin/execution/admin-execution.service.ts b/frontend/src/app/dashboard/service/admin/execution/admin-execution.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/admin/execution/admin-execution.service.ts
rename to frontend/src/app/dashboard/service/admin/execution/admin-execution.service.ts
diff --git a/core/gui/src/app/dashboard/service/admin/guard/admin-guard.service.ts b/frontend/src/app/dashboard/service/admin/guard/admin-guard.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/admin/guard/admin-guard.service.ts
rename to frontend/src/app/dashboard/service/admin/guard/admin-guard.service.ts
diff --git a/core/gui/src/app/dashboard/service/admin/settings/admin-settings.service.ts b/frontend/src/app/dashboard/service/admin/settings/admin-settings.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/admin/settings/admin-settings.service.ts
rename to frontend/src/app/dashboard/service/admin/settings/admin-settings.service.ts
diff --git a/core/gui/src/app/dashboard/service/admin/user/admin-user.service.ts b/frontend/src/app/dashboard/service/admin/user/admin-user.service.ts
similarity index 96%
rename from core/gui/src/app/dashboard/service/admin/user/admin-user.service.ts
rename to frontend/src/app/dashboard/service/admin/user/admin-user.service.ts
index 203cc0bbedf..481c5e5302e 100644
--- a/core/gui/src/app/dashboard/service/admin/user/admin-user.service.ts
+++ b/frontend/src/app/dashboard/service/admin/user/admin-user.service.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { HttpClient, HttpHeaders, HttpParams } from "@angular/common/http";
+import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable } from "rxjs";
 import { AppSettings } from "../../../../common/app-setting";
-import { Role, User, File, Workflow, ExecutionQuota } from "../../../../common/type/user";
+import { ExecutionQuota, File, Role, User, Workflow } from "../../../../common/type/user";
 import { DatasetQuota } from "src/app/dashboard/type/quota-statistic.interface";
 
 export const USER_BASE_URL = `${AppSettings.getApiEndpoint()}/admin/user`;
diff --git a/core/gui/src/app/dashboard/service/user/dataset/dataset.service.ts b/frontend/src/app/dashboard/service/user/dataset/dataset.service.ts
similarity index 69%
rename from core/gui/src/app/dashboard/service/user/dataset/dataset.service.ts
rename to frontend/src/app/dashboard/service/user/dataset/dataset.service.ts
index 40226d0fef7..97b2e264b75 100644
--- a/core/gui/src/app/dashboard/service/user/dataset/dataset.service.ts
+++ b/frontend/src/app/dashboard/service/user/dataset/dataset.service.ts
@@ -18,15 +18,16 @@
  */
 
 import { Injectable } from "@angular/core";
-import { HttpClient, HttpParams, HttpResponse } from "@angular/common/http";
+import { HttpClient, HttpErrorResponse, HttpParams } from "@angular/common/http";
 import { catchError, map, mergeMap, switchMap, tap, toArray } from "rxjs/operators";
 import { Dataset, DatasetVersion } from "../../../../common/type/dataset";
 import { AppSettings } from "../../../../common/app-setting";
-import { EMPTY, forkJoin, from, Observable, of, throwError } from "rxjs";
+import { EMPTY, from, Observable, throwError } from "rxjs";
 import { DashboardDataset } from "../../../type/dashboard-dataset.interface";
 import { DatasetFileNode } from "../../../../common/type/datasetVersionFileTree";
 import { DatasetStagedObject } from "../../../../common/type/dataset-staged-object";
 import { GuiConfigService } from "../../../../common/service/gui-config.service";
+import { AuthService } from "src/app/common/service/user/auth.service";
 
 export const DATASET_BASE_URL = "dataset";
 export const DATASET_CREATE_URL = DATASET_BASE_URL + "/create";
@@ -51,8 +52,6 @@ export interface MultipartUploadProgress {
   filePath: string;
   percentage: number;
   status: "initializing" | "uploading" | "finished" | "aborted";
-  uploadId: string;
-  physicalAddress: string;
   uploadSpeed?: number; // bytes per second
   estimatedTimeRemaining?: number; // seconds
   totalTime?: number; // total seconds taken
@@ -122,6 +121,7 @@ export class DatasetService {
   public retrieveAccessibleDatasets(): Observable<DashboardDataset[]> {
     return this.http.get<DashboardDataset[]>(`${AppSettings.getApiEndpoint()}/${DATASET_LIST_URL}`);
   }
+
   public createDatasetVersion(did: number, newVersion: string): Observable<DatasetVersion> {
     return this.http
       .post<{
@@ -141,6 +141,12 @@ export class DatasetService {
   /**
    * Handles multipart upload for large files using RxJS,
    * with a concurrency limit on how many parts we process in parallel.
+   *
+   * Backend flow:
+   *   POST /dataset/multipart-upload?type=init&ownerEmail=...&datasetName=...&filePath=...&numParts=N
+   *   POST /dataset/multipart-upload/part?ownerEmail=...&datasetName=...&filePath=...&partNumber=<n>  (body: raw chunk)
+   *   POST /dataset/multipart-upload?type=finish&ownerEmail=...&datasetName=...&filePath=...
+   *   POST /dataset/multipart-upload?type=abort&ownerEmail=...&datasetName=...&filePath=...
    */
   public multipartUpload(
     ownerEmail: string,
@@ -152,40 +158,52 @@ export class DatasetService {
   ): Observable<MultipartUploadProgress> {
     const partCount = Math.ceil(file.size / partSize);
 
-    return new Observable(observer => {
-      // Track upload progress for each part independently
+    return new Observable<MultipartUploadProgress>(observer => {
+      // Track upload progress (bytes) for each part independently
       const partProgress = new Map<number, number>();
 
       // Progress tracking state
-      const startTime = Date.now();
+      let startTime: number | null = null;
       const speedSamples: number[] = [];
       let lastETA = 0;
       let lastUpdateTime = 0;
 
-      // Calculate stats with smoothing
+      const lastStats = {
+        uploadSpeed: 0,
+        estimatedTimeRemaining: 0,
+        totalTime: 0,
+      };
+
+      const getTotalTime = () => (startTime ? (Date.now() - startTime) / 1000 : 0);
+
+      // Calculate stats with smoothing and simple throttling (~1s)
       const calculateStats = (totalUploaded: number) => {
+        if (startTime === null) {
+          startTime = Date.now();
+        }
+
         const now = Date.now();
-        const elapsed = (now - startTime) / 1000;
+        const elapsed = getTotalTime();
 
-        // Throttle updates to every 1s
         const shouldUpdate = now - lastUpdateTime >= 1000;
         if (!shouldUpdate) {
-          return null;
+          // keep totalTime fresh even when throttled
+          lastStats.totalTime = elapsed;
+          return lastStats;
         }
         lastUpdateTime = now;
 
-        // Calculate speed with moving average
         const currentSpeed = elapsed > 0 ? totalUploaded / elapsed : 0;
         speedSamples.push(currentSpeed);
-        if (speedSamples.length > 5) speedSamples.shift();
-        const avgSpeed = speedSamples.reduce((a, b) => a + b, 0) / speedSamples.length;
+        if (speedSamples.length > 5) {
+          speedSamples.shift();
+        }
+        const avgSpeed = speedSamples.length > 0 ? speedSamples.reduce((a, b) => a + b, 0) / speedSamples.length : 0;
 
-        // Calculate smooth ETA
         const remaining = file.size - totalUploaded;
         let eta = avgSpeed > 0 ? remaining / avgSpeed : 0;
-        eta = Math.min(eta, 24 * 60 * 60); // cap ETA at 24h, 86400 sec
+        eta = Math.min(eta, 24 * 60 * 60); // cap ETA at 24h
 
-        // Smooth ETA changes (limit to 30% change)
         if (lastETA > 0 && eta > 0) {
           const maxChange = lastETA * 0.3;
           const diff = Math.abs(eta - lastETA);
@@ -195,106 +213,118 @@ export class DatasetService {
         }
         lastETA = eta;
 
-        // Near completion optimization
         const percentComplete = (totalUploaded / file.size) * 100;
         if (percentComplete > 95) {
           eta = Math.min(eta, 10);
         }
 
-        return {
-          uploadSpeed: avgSpeed,
-          estimatedTimeRemaining: Math.max(0, Math.round(eta)),
-          totalTime: elapsed,
-        };
+        lastStats.uploadSpeed = avgSpeed;
+        lastStats.estimatedTimeRemaining = Math.max(0, Math.round(eta));
+        lastStats.totalTime = elapsed;
+
+        return lastStats;
       };
 
-      const subscription = this.initiateMultipartUpload(ownerEmail, datasetName, filePath, partCount)
+      // 1. INIT: ask backend to create a LakeFS multipart upload session
+      const initParams = new HttpParams()
+        .set("type", "init")
+        .set("ownerEmail", ownerEmail)
+        .set("datasetName", datasetName)
+        .set("filePath", encodeURIComponent(filePath))
+        .set("numParts", partCount.toString());
+
+      const init$ = this.http.post<{}>(
+        `${AppSettings.getApiEndpoint()}/${DATASET_BASE_URL}/multipart-upload`,
+        {},
+        { params: initParams }
+      );
+
+      const initWithAbortRetry$ = init$.pipe(
+        catchError((res: unknown) => {
+          const err = res as HttpErrorResponse;
+          if (err.status !== 409) {
+            return throwError(() => err);
+          }
+
+          // Init failed because a session already exists. Abort it and retry init once.
+          return this.finalizeMultipartUpload(ownerEmail, datasetName, filePath, true).pipe(
+            // best-effort abort; if abort itself fails, let the re-init decide
+            catchError(() => EMPTY),
+            switchMap(() => init$)
+          );
+        })
+      );
+
+      const subscription = initWithAbortRetry$
         .pipe(
-          switchMap(initiateResponse => {
-            const { uploadId, presignedUrls, physicalAddress } = initiateResponse;
-            if (!uploadId) {
-              observer.error(new Error("Failed to initiate multipart upload"));
-              return EMPTY;
-            }
+          switchMap(initResp => {
+            // Notify UI that upload is starting
             observer.next({
-              filePath: filePath,
+              filePath,
               percentage: 0,
               status: "initializing",
-              uploadId: uploadId,
-              physicalAddress: physicalAddress,
               uploadSpeed: 0,
               estimatedTimeRemaining: 0,
               totalTime: 0,
             });
 
-            // Keep track of all uploaded parts
-            const uploadedParts: { PartNumber: number; ETag: string }[] = [];
-
-            // 1) Convert presignedUrls into a stream of URLs
-            return from(presignedUrls).pipe(
-              // 2) Use mergeMap with concurrency limit to upload chunk by chunk
-              mergeMap((url, index) => {
+            // 2. Upload each part to /multipart-upload/part using XMLHttpRequest
+            return from(Array.from({ length: partCount }, (_, i) => i)).pipe(
+              mergeMap(index => {
                 const partNumber = index + 1;
                 const start = index * partSize;
                 const end = Math.min(start + partSize, file.size);
                 const chunk = file.slice(start, end);
 
-                // Upload the chunk
-                return new Observable(partObserver => {
+                return new Observable<void>(partObserver => {
                   const xhr = new XMLHttpRequest();
 
                   xhr.upload.addEventListener("progress", event => {
                     if (event.lengthComputable) {
-                      // Update this specific part's progress
                       partProgress.set(partNumber, event.loaded);
 
-                      // Calculate total progress across all parts
                       let totalUploaded = 0;
-                      partProgress.forEach(bytes => (totalUploaded += bytes));
+                      partProgress.forEach(bytes => {
+                        totalUploaded += bytes;
+                      });
+
                       const percentage = Math.round((totalUploaded / file.size) * 100);
                       const stats = calculateStats(totalUploaded);
 
                       observer.next({
                         filePath,
-                        percentage: Math.min(percentage, 99), // Cap at 99% until finalized
+                        percentage: Math.min(percentage, 99),
                         status: "uploading",
-                        uploadId,
-                        physicalAddress,
                         ...stats,
                       });
                     }
                   });
 
                   xhr.addEventListener("load", () => {
-                    if (xhr.status === 200 || xhr.status === 201) {
-                      const etag = xhr.getResponseHeader("ETag")?.replace(/"/g, "");
-                      if (!etag) {
-                        partObserver.error(new Error(`Missing ETag for part ${partNumber}`));
-                        return;
-                      }
-
-                      // Mark this part as fully uploaded
+                    if (xhr.status === 200 || xhr.status === 204) {
+                      // Mark part as fully uploaded
                       partProgress.set(partNumber, chunk.size);
-                      uploadedParts.push({ PartNumber: partNumber, ETag: etag });
 
-                      // Recalculate progress
                       let totalUploaded = 0;
-                      partProgress.forEach(bytes => (totalUploaded += bytes));
-                      const percentage = Math.round((totalUploaded / file.size) * 100);
+                      partProgress.forEach(bytes => {
+                        totalUploaded += bytes;
+                      });
+
+                      // Force stats recompute on completion
                       lastUpdateTime = 0;
+                      const percentage = Math.round((totalUploaded / file.size) * 100);
                       const stats = calculateStats(totalUploaded);
 
                       observer.next({
                         filePath,
                         percentage: Math.min(percentage, 99),
                         status: "uploading",
-                        uploadId,
-                        physicalAddress,
                         ...stats,
                       });
+
                       partObserver.complete();
                     } else {
-                      partObserver.error(new Error(`Failed to upload part ${partNumber}`));
+                      partObserver.error(new Error(`Failed to upload part ${partNumber} (HTTP ${xhr.status})`));
                     }
                   });
 
@@ -304,62 +334,88 @@ export class DatasetService {
                     partObserver.error(new Error(`Failed to upload part ${partNumber}`));
                   });
 
-                  xhr.open("PUT", url);
+                  const partUrl =
+                    `${AppSettings.getApiEndpoint()}/${DATASET_BASE_URL}/multipart-upload/part` +
+                    `?ownerEmail=${encodeURIComponent(ownerEmail)}` +
+                    `&datasetName=${encodeURIComponent(datasetName)}` +
+                    `&filePath=${encodeURIComponent(filePath)}` +
+                    `&partNumber=${partNumber}`;
+
+                  xhr.open("POST", partUrl);
+                  xhr.setRequestHeader("Content-Type", "application/octet-stream");
+                  const token = AuthService.getAccessToken();
+                  if (token) {
+                    xhr.setRequestHeader("Authorization", `Bearer ${token}`);
+                  }
                   xhr.send(chunk);
+                  return () => {
+                    try {
+                      xhr.abort();
+                    } catch {}
+                  };
                 });
               }, concurrencyLimit),
-
-              // 3) Collect results from all uploads (like forkJoin, but respects concurrency)
-              toArray(),
-              // 4) Finalize if all parts succeeded
-              switchMap(() =>
-                this.finalizeMultipartUpload(
-                  ownerEmail,
-                  datasetName,
-                  filePath,
-                  uploadId,
-                  uploadedParts,
-                  physicalAddress,
-                  false
-                )
-              ),
+              toArray(), // wait for all parts
+              // 3. FINISH: notify backend that all parts are done
+              switchMap(() => {
+                const finishParams = new HttpParams()
+                  .set("type", "finish")
+                  .set("ownerEmail", ownerEmail)
+                  .set("datasetName", datasetName)
+                  .set("filePath", encodeURIComponent(filePath));
+
+                return this.http.post(
+                  `${AppSettings.getApiEndpoint()}/${DATASET_BASE_URL}/multipart-upload`,
+                  {},
+                  { params: finishParams }
+                );
+              }),
               tap(() => {
-                const finalTotalTime = (Date.now() - startTime) / 1000;
+                const totalTime = getTotalTime();
                 observer.next({
                   filePath,
                   percentage: 100,
                   status: "finished",
-                  uploadId: uploadId,
-                  physicalAddress: physicalAddress,
                   uploadSpeed: 0,
                   estimatedTimeRemaining: 0,
-                  totalTime: finalTotalTime,
+                  totalTime,
                 });
                 observer.complete();
               }),
               catchError((error: unknown) => {
-                // If an error occurred, abort the upload
-                const currentTotalTime = (Date.now() - startTime) / 1000;
+                // On error, compute best-effort percentage from bytes we've seen
+                let totalUploaded = 0;
+                partProgress.forEach(bytes => {
+                  totalUploaded += bytes;
+                });
+                const percentage = file.size > 0 ? Math.round((totalUploaded / file.size) * 100) : 0;
+
                 observer.next({
                   filePath,
-                  percentage: Math.round((uploadedParts.length / partCount) * 100),
+                  percentage,
                   status: "aborted",
-                  uploadId: uploadId,
-                  physicalAddress: physicalAddress,
                   uploadSpeed: 0,
                   estimatedTimeRemaining: 0,
-                  totalTime: currentTotalTime,
+                  totalTime: getTotalTime(),
                 });
 
-                return this.finalizeMultipartUpload(
-                  ownerEmail,
-                  datasetName,
-                  filePath,
-                  uploadId,
-                  uploadedParts,
-                  physicalAddress,
-                  true
-                ).pipe(switchMap(() => throwError(() => error)));
+                // Abort on backend
+                const abortParams = new HttpParams()
+                  .set("type", "abort")
+                  .set("ownerEmail", ownerEmail)
+                  .set("datasetName", datasetName)
+                  .set("filePath", encodeURIComponent(filePath));
+
+                return this.http
+                  .post(
+                    `${AppSettings.getApiEndpoint()}/${DATASET_BASE_URL}/multipart-upload`,
+                    {},
+                    { params: abortParams }
+                  )
+                  .pipe(
+                    switchMap(() => throwError(() => error)),
+                    catchError(() => throwError(() => error))
+                  );
               })
             );
           })
@@ -367,59 +423,26 @@ export class DatasetService {
         .subscribe({
           error: (err: unknown) => observer.error(err),
         });
+
       return () => subscription.unsubscribe();
     });
   }
 
-  /**
-   * Initiates a multipart upload and retrieves presigned URLs for each part.
-   * @param ownerEmail Owner's email
-   * @param datasetName Dataset Name
-   * @param filePath File path within the dataset
-   * @param numParts Number of parts for the multipart upload
-   */
-  private initiateMultipartUpload(
-    ownerEmail: string,
-    datasetName: string,
-    filePath: string,
-    numParts: number
-  ): Observable<{ uploadId: string; presignedUrls: string[]; physicalAddress: string }> {
-    const params = new HttpParams()
-      .set("type", "init")
-      .set("ownerEmail", ownerEmail)
-      .set("datasetName", datasetName)
-      .set("filePath", encodeURIComponent(filePath))
-      .set("numParts", numParts.toString());
-
-    return this.http.post<{ uploadId: string; presignedUrls: string[]; physicalAddress: string }>(
-      `${AppSettings.getApiEndpoint()}/${DATASET_BASE_URL}/multipart-upload`,
-      {},
-      { params }
-    );
-  }
-
-  /**
-   * Completes or aborts a multipart upload, sending part numbers and ETags to the backend.
-   */
   public finalizeMultipartUpload(
     ownerEmail: string,
     datasetName: string,
     filePath: string,
-    uploadId: string,
-    parts: { PartNumber: number; ETag: string }[],
-    physicalAddress: string,
     isAbort: boolean
   ): Observable<Response> {
     const params = new HttpParams()
       .set("type", isAbort ? "abort" : "finish")
       .set("ownerEmail", ownerEmail)
       .set("datasetName", datasetName)
-      .set("filePath", encodeURIComponent(filePath))
-      .set("uploadId", uploadId);
+      .set("filePath", encodeURIComponent(filePath));
 
     return this.http.post<Response>(
       `${AppSettings.getApiEndpoint()}/${DATASET_BASE_URL}/multipart-upload`,
-      { parts, physicalAddress },
+      {},
       { params }
     );
   }
diff --git a/core/gui/src/app/dashboard/service/user/download/download.service.spec.ts b/frontend/src/app/dashboard/service/user/download/download.service.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/download/download.service.spec.ts
rename to frontend/src/app/dashboard/service/user/download/download.service.spec.ts
diff --git a/core/gui/src/app/dashboard/service/user/download/download.service.ts b/frontend/src/app/dashboard/service/user/download/download.service.ts
similarity index 69%
rename from core/gui/src/app/dashboard/service/user/download/download.service.ts
rename to frontend/src/app/dashboard/service/user/download/download.service.ts
index f02a2411b54..53333e744d5 100644
--- a/core/gui/src/app/dashboard/service/user/download/download.service.ts
+++ b/frontend/src/app/dashboard/service/user/download/download.service.ts
@@ -18,21 +18,24 @@
  */
 
 import { Injectable } from "@angular/core";
-import { Observable, throwError, of, forkJoin, from } from "rxjs";
-import { map, tap, catchError, switchMap } from "rxjs/operators";
+import { forkJoin, from, Observable, of, throwError } from "rxjs";
+import { catchError, map, switchMap, tap } from "rxjs/operators";
 import { FileSaverService } from "../file/file-saver.service";
 import { NotificationService } from "../../../../common/service/notification/notification.service";
-import { DATASET_BASE_URL, DatasetService } from "../dataset/dataset.service";
+import { DatasetService } from "../dataset/dataset.service";
 import { WorkflowPersistService } from "src/app/common/service/workflow-persist/workflow-persist.service";
 import * as JSZip from "jszip";
 import { Workflow } from "../../../../common/type/workflow";
-import { AppSettings } from "../../../../common/app-setting";
 import { HttpClient, HttpResponse } from "@angular/common/http";
 import { WORKFLOW_EXECUTIONS_API_BASE_URL } from "../workflow-executions/workflow-executions.service";
 import { DashboardWorkflowComputingUnit } from "../../../../workspace/types/workflow-computing-unit";
+import { TOKEN_KEY } from "../../../../common/service/user/auth.service";
+
 var contentDisposition = require("content-disposition");
 
 export const EXPORT_BASE_URL = "result/export";
+const IFRAME_TIMEOUT_MS = 10000;
+export const DOWNLOADABILITY_BASE_URL = "result/downloadability";
 
 interface DownloadableItem {
   blob: Blob;
@@ -44,6 +47,10 @@ export interface ExportWorkflowJsonResponse {
   message: string;
 }
 
+export interface WorkflowResultDownloadabilityResponse {
+  [operatorId: string]: string[]; // operatorId -> array of dataset labels blocking export
+}
+
 @Injectable({
   providedIn: "root",
 })
@@ -116,10 +123,21 @@ export class DownloadService {
   }
 
   /**
-   * Export the workflow result. If destination = "local", the server returns a BLOB (file).
-   * Otherwise, it returns JSON with a status message.
+   * Retrieves workflow result downloadability information from the backend.
+   * Returns a map of operator IDs to arrays of dataset labels that block their export.
+   *
+   * @param workflowId The workflow ID to check
+   * @returns Observable of downloadability information
    */
-  public exportWorkflowResult(
+  public getWorkflowResultDownloadability(workflowId: number): Observable<WorkflowResultDownloadabilityResponse> {
+    const urlPath = `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${workflowId}/${DOWNLOADABILITY_BASE_URL}`;
+    return this.http.get<WorkflowResultDownloadabilityResponse>(urlPath);
+  }
+
+  /**
+   * Export the workflow result to specified dataset(s).
+   */
+  public exportWorkflowResultToDataset(
     exportType: string,
     workflowId: number,
     workflowName: string,
@@ -131,7 +149,6 @@ export class DownloadService {
     rowIndex: number,
     columnIndex: number,
     filename: string,
-    destination: "local" | "dataset" = "dataset", // "local" or "dataset" => default to "dataset"
     unit: DashboardWorkflowComputingUnit // computing unit for cluster setting
   ): Observable<HttpResponse<Blob> | HttpResponse<ExportWorkflowJsonResponse>> {
     const computingUnitId = unit.computingUnit.cuid;
@@ -144,51 +161,91 @@ export class DownloadService {
       rowIndex,
       columnIndex,
       filename,
-      destination,
       computingUnitId,
     };
 
     const urlPath =
       unit && unit.computingUnit.type == "kubernetes" && unit.computingUnit?.cuid
-        ? `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}?cuid=${unit.computingUnit.cuid}`
-        : `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}`;
-    if (destination === "local") {
-      return this.http.post(urlPath, requestBody, {
-        responseType: "blob",
-        observe: "response",
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/octet-stream",
-        },
-      });
-    } else {
-      // dataset => return JSON
-      return this.http.post<ExportWorkflowJsonResponse>(urlPath, requestBody, {
-        responseType: "json",
-        observe: "response",
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json",
-        },
-      });
-    }
+        ? `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/dataset?cuid=${unit.computingUnit.cuid}`
+        : `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/dataset`;
+
+    return this.http.post<ExportWorkflowJsonResponse>(urlPath, requestBody, {
+      responseType: "json",
+      observe: "response",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+    });
   }
 
   /**
-   * Utility function to download a file from the server from blob object.
+   * Export the workflow result to local filesystem. The export is handled by the browser.
    */
-  public saveBlobFile(response: any, defaultFileName: string): void {
-    // If the server sets "Content-Disposition: attachment; filename="someName.csv"" header,
-    // we can parse that out. Otherwise just use defaultFileName.
-    const dispositionHeader = response.headers.get("Content-Disposition");
-    let fileName = defaultFileName;
-    if (dispositionHeader) {
-      const parsed = contentDisposition.parse(dispositionHeader);
-      fileName = parsed.parameters.filename || defaultFileName;
-    }
+  public exportWorkflowResultToLocal(
+    exportType: string,
+    workflowId: number,
+    workflowName: string,
+    operators: {
+      id: string;
+      outputType: string;
+    }[],
+    rowIndex: number,
+    columnIndex: number,
+    filename: string,
+    unit: DashboardWorkflowComputingUnit // computing unit for cluster setting
+  ): void {
+    const computingUnitId = unit.computingUnit.cuid;
+    const datasetIds: number[] = [];
+    const requestBody = {
+      exportType,
+      workflowId,
+      workflowName,
+      operators,
+      datasetIds,
+      rowIndex,
+      columnIndex,
+      filename,
+      computingUnitId,
+    };
+    const token = localStorage.getItem(TOKEN_KEY) ?? "";
 
-    const blob = response.body; // the actual file data
-    this.fileSaverService.saveAs(blob, fileName);
+    const urlPath =
+      unit && unit.computingUnit.type == "kubernetes" && unit.computingUnit?.cuid
+        ? `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/local?cuid=${unit.computingUnit.cuid}`
+        : `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/local`;
+
+    const iframe = document.createElement("iframe");
+    iframe.name = "download-iframe";
+    iframe.style.display = "none";
+    document.body.appendChild(iframe);
+
+    const form = document.createElement("form");
+    form.method = "POST";
+    form.action = urlPath;
+    form.target = "download-iframe";
+    form.enctype = "application/x-www-form-urlencoded";
+    form.style.display = "none";
+
+    const requestInput = document.createElement("input");
+    requestInput.type = "hidden";
+    requestInput.name = "request";
+    requestInput.value = JSON.stringify(requestBody);
+    form.appendChild(requestInput);
+
+    const tokenInput = document.createElement("input");
+    tokenInput.type = "hidden";
+    tokenInput.name = "token";
+    tokenInput.value = token;
+    form.appendChild(tokenInput);
+
+    document.body.appendChild(form);
+    form.submit();
+
+    setTimeout(() => {
+      document.body.removeChild(form);
+      document.body.removeChild(iframe);
+    }, IFRAME_TIMEOUT_MS);
   }
 
   downloadOperatorsResult(
diff --git a/core/gui/src/app/dashboard/service/user/file/file-saver.service.ts b/frontend/src/app/dashboard/service/user/file/file-saver.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/file/file-saver.service.ts
rename to frontend/src/app/dashboard/service/user/file/file-saver.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/flarum/flarum.service.ts b/frontend/src/app/dashboard/service/user/flarum/flarum.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/flarum/flarum.service.ts
rename to frontend/src/app/dashboard/service/user/flarum/flarum.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/project/stub-user-project.service.ts b/frontend/src/app/dashboard/service/user/project/stub-user-project.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/project/stub-user-project.service.ts
rename to frontend/src/app/dashboard/service/user/project/stub-user-project.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/project/user-project.service.ts b/frontend/src/app/dashboard/service/user/project/user-project.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/project/user-project.service.ts
rename to frontend/src/app/dashboard/service/user/project/user-project.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/public-project/public-project.service.ts b/frontend/src/app/dashboard/service/user/public-project/public-project.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/public-project/public-project.service.ts
rename to frontend/src/app/dashboard/service/user/public-project/public-project.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/quota/user-quota.service.ts b/frontend/src/app/dashboard/service/user/quota/user-quota.service.ts
similarity index 97%
rename from core/gui/src/app/dashboard/service/user/quota/user-quota.service.ts
rename to frontend/src/app/dashboard/service/user/quota/user-quota.service.ts
index 166ab6e7b6b..ab5b4e7fe4d 100644
--- a/core/gui/src/app/dashboard/service/user/quota/user-quota.service.ts
+++ b/frontend/src/app/dashboard/service/user/quota/user-quota.service.ts
@@ -21,7 +21,7 @@ import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable } from "rxjs";
 import { AppSettings } from "../../../../common/app-setting";
-import { Workflow, ExecutionQuota } from "../../../../common/type/user";
+import { ExecutionQuota, Workflow } from "../../../../common/type/user";
 import { DatasetQuota } from "src/app/dashboard/type/quota-statistic.interface";
 
 export const USER_BASE_URL = `${AppSettings.getApiEndpoint()}/quota`;
diff --git a/core/gui/src/app/dashboard/service/user/search.service.ts b/frontend/src/app/dashboard/service/user/search.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/search.service.ts
rename to frontend/src/app/dashboard/service/user/search.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/share-access/share-access.service.ts b/frontend/src/app/dashboard/service/user/share-access/share-access.service.ts
similarity index 99%
rename from core/gui/src/app/dashboard/service/user/share-access/share-access.service.ts
rename to frontend/src/app/dashboard/service/user/share-access/share-access.service.ts
index 6227cdfa3d9..f5881bdf0bb 100644
--- a/core/gui/src/app/dashboard/service/user/share-access/share-access.service.ts
+++ b/frontend/src/app/dashboard/service/user/share-access/share-access.service.ts
@@ -22,6 +22,7 @@ import { Injectable } from "@angular/core";
 import { Observable } from "rxjs";
 import { AppSettings } from "../../../../common/app-setting";
 import { ShareAccess } from "../../../type/share-access.interface";
+
 export const BASE = `${AppSettings.getApiEndpoint()}/access`;
 @Injectable({
   providedIn: "root",
diff --git a/core/gui/src/app/dashboard/service/user/stub-search.service.ts b/frontend/src/app/dashboard/service/user/stub-search.service.ts
similarity index 98%
rename from core/gui/src/app/dashboard/service/user/stub-search.service.ts
rename to frontend/src/app/dashboard/service/user/stub-search.service.ts
index a6057a89c39..6ab1628626f 100644
--- a/core/gui/src/app/dashboard/service/user/stub-search.service.ts
+++ b/frontend/src/app/dashboard/service/user/stub-search.service.ts
@@ -18,7 +18,7 @@
  */
 
 import { Injectable } from "@angular/core";
-import { firstValueFrom, Observable, of } from "rxjs";
+import { Observable, of } from "rxjs";
 import { SearchResult } from "../../type/search-result";
 import { SearchFilterParameters, searchTestEntries } from "../../type/search-filter-parameters";
 import { DashboardEntry, UserInfo } from "../../type/dashboard-entry";
diff --git a/core/gui/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.spec.ts b/frontend/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.spec.ts
rename to frontend/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.spec.ts
diff --git a/core/gui/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.ts b/frontend/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.ts
rename to frontend/src/app/dashboard/service/user/workflow-executions/workflow-executions.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/workflow-snapshot/workflow-snapshot.service.ts b/frontend/src/app/dashboard/service/user/workflow-snapshot/workflow-snapshot.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/workflow-snapshot/workflow-snapshot.service.ts
rename to frontend/src/app/dashboard/service/user/workflow-snapshot/workflow-snapshot.service.ts
diff --git a/core/gui/src/app/dashboard/service/user/workflow-version/workflow-version.service.spec.ts b/frontend/src/app/dashboard/service/user/workflow-version/workflow-version.service.spec.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/workflow-version/workflow-version.service.spec.ts
rename to frontend/src/app/dashboard/service/user/workflow-version/workflow-version.service.spec.ts
diff --git a/core/gui/src/app/dashboard/service/user/workflow-version/workflow-version.service.ts b/frontend/src/app/dashboard/service/user/workflow-version/workflow-version.service.ts
similarity index 100%
rename from core/gui/src/app/dashboard/service/user/workflow-version/workflow-version.service.ts
rename to frontend/src/app/dashboard/service/user/workflow-version/workflow-version.service.ts
diff --git a/core/gui/src/app/dashboard/type/dashboard-dataset.interface.ts b/frontend/src/app/dashboard/type/dashboard-dataset.interface.ts
similarity index 87%
rename from core/gui/src/app/dashboard/type/dashboard-dataset.interface.ts
rename to frontend/src/app/dashboard/type/dashboard-dataset.interface.ts
index 2ea00582640..335f744dab5 100644
--- a/core/gui/src/app/dashboard/type/dashboard-dataset.interface.ts
+++ b/frontend/src/app/dashboard/type/dashboard-dataset.interface.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Dataset, DatasetVersion } from "../../common/type/dataset";
-import { DatasetFileNode } from "../../common/type/datasetVersionFileTree";
+import { Dataset } from "../../common/type/dataset";
 
 export interface DashboardDataset {
   isOwner: boolean;
diff --git a/core/gui/src/app/dashboard/type/dashboard-entry.ts b/frontend/src/app/dashboard/type/dashboard-entry.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/dashboard-entry.ts
rename to frontend/src/app/dashboard/type/dashboard-entry.ts
diff --git a/core/gui/src/app/dashboard/type/dashboard-file.interface.ts b/frontend/src/app/dashboard/type/dashboard-file.interface.ts
similarity index 90%
rename from core/gui/src/app/dashboard/type/dashboard-file.interface.ts
rename to frontend/src/app/dashboard/type/dashboard-file.interface.ts
index 573b9f11533..3dd5925e342 100644
--- a/core/gui/src/app/dashboard/type/dashboard-file.interface.ts
+++ b/frontend/src/app/dashboard/type/dashboard-file.interface.ts
@@ -27,8 +27,8 @@ export interface DashboardFile
 /**
  * This interface stores the information about the users' files.
  * These information is used to locate the file for the operators.
- * Corresponds to `src/main/scala/edu/uci/ics/texera/web/resource/dashboard/file/UserFileResource.scala` (backend);
- * and `core/scripts/sql/texera_ddl.sql`, table `file` (database).
+ * Corresponds to `src/main/scala/org/apache/texera/web/resource/dashboard/file/UserFileResource.scala` (backend);
+ * and `sql/texera_ddl.sql`, table `file` (database).
  */
 export interface UserFile {
   ownerUid: number;
diff --git a/core/gui/src/app/dashboard/type/dashboard-project.interface.ts b/frontend/src/app/dashboard/type/dashboard-project.interface.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/dashboard-project.interface.ts
rename to frontend/src/app/dashboard/type/dashboard-project.interface.ts
diff --git a/core/gui/src/app/dashboard/type/dashboard-workflow.interface.ts b/frontend/src/app/dashboard/type/dashboard-workflow.interface.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/dashboard-workflow.interface.ts
rename to frontend/src/app/dashboard/type/dashboard-workflow.interface.ts
diff --git a/core/gui/src/app/dashboard/type/google-api-response.ts b/frontend/src/app/dashboard/type/google-api-response.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/google-api-response.ts
rename to frontend/src/app/dashboard/type/google-api-response.ts
diff --git a/frontend/src/app/dashboard/type/jupyter-notebook.interface.ts b/frontend/src/app/dashboard/type/jupyter-notebook.interface.ts
new file mode 100644
index 00000000000..b57fd0f9dd4
--- /dev/null
+++ b/frontend/src/app/dashboard/type/jupyter-notebook.interface.ts
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface JupyterNotebook {
+  cells: JupyterCell[];
+  metadata: any;
+  nbformat: number;
+  nbformat_minor: number;
+}
+
+export interface JupyterCell {
+  cell_type: string;
+  source: string[];
+  metadata: any;
+  outputs?: JupyterOutput[];
+}
+
+export interface JupyterOutput {
+  output_type: string;
+  text?: string[];
+  data?: { [key: string]: any };
+  traceback?: string[];
+}
diff --git a/core/gui/src/app/dashboard/type/quota-statistic.interface.ts b/frontend/src/app/dashboard/type/quota-statistic.interface.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/quota-statistic.interface.ts
rename to frontend/src/app/dashboard/type/quota-statistic.interface.ts
diff --git a/core/gui/src/app/dashboard/type/search-filter-parameters.ts b/frontend/src/app/dashboard/type/search-filter-parameters.ts
similarity index 99%
rename from core/gui/src/app/dashboard/type/search-filter-parameters.ts
rename to frontend/src/app/dashboard/type/search-filter-parameters.ts
index 848bec2619d..8cf39fc5a8c 100644
--- a/core/gui/src/app/dashboard/type/search-filter-parameters.ts
+++ b/frontend/src/app/dashboard/type/search-filter-parameters.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { result } from "lodash";
 import { DashboardEntry } from "./dashboard-entry";
 import { SortMethod } from "./sort-method";
 
diff --git a/core/gui/src/app/dashboard/type/search-result.ts b/frontend/src/app/dashboard/type/search-result.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/search-result.ts
rename to frontend/src/app/dashboard/type/search-result.ts
diff --git a/core/gui/src/app/dashboard/type/share-access.interface.ts b/frontend/src/app/dashboard/type/share-access.interface.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/share-access.interface.ts
rename to frontend/src/app/dashboard/type/share-access.interface.ts
diff --git a/core/gui/src/app/dashboard/type/sort-method.ts b/frontend/src/app/dashboard/type/sort-method.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/sort-method.ts
rename to frontend/src/app/dashboard/type/sort-method.ts
diff --git a/core/gui/src/app/dashboard/type/type-predicates.ts b/frontend/src/app/dashboard/type/type-predicates.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/type-predicates.ts
rename to frontend/src/app/dashboard/type/type-predicates.ts
diff --git a/core/gui/src/app/dashboard/type/workflow-executions-entry.ts b/frontend/src/app/dashboard/type/workflow-executions-entry.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/workflow-executions-entry.ts
rename to frontend/src/app/dashboard/type/workflow-executions-entry.ts
diff --git a/core/gui/src/app/dashboard/type/workflow-metadata.interface.ts b/frontend/src/app/dashboard/type/workflow-metadata.interface.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/workflow-metadata.interface.ts
rename to frontend/src/app/dashboard/type/workflow-metadata.interface.ts
diff --git a/core/gui/src/app/dashboard/type/workflow-runtime-statistics.ts b/frontend/src/app/dashboard/type/workflow-runtime-statistics.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/workflow-runtime-statistics.ts
rename to frontend/src/app/dashboard/type/workflow-runtime-statistics.ts
diff --git a/core/gui/src/app/dashboard/type/workflow-snapshot-entry.ts b/frontend/src/app/dashboard/type/workflow-snapshot-entry.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/workflow-snapshot-entry.ts
rename to frontend/src/app/dashboard/type/workflow-snapshot-entry.ts
diff --git a/core/gui/src/app/dashboard/type/workflow-version-entry.ts b/frontend/src/app/dashboard/type/workflow-version-entry.ts
similarity index 100%
rename from core/gui/src/app/dashboard/type/workflow-version-entry.ts
rename to frontend/src/app/dashboard/type/workflow-version-entry.ts
diff --git a/core/gui/src/app/hub/component/about/about.component.html b/frontend/src/app/hub/component/about/about.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/about/about.component.html
rename to frontend/src/app/hub/component/about/about.component.html
diff --git a/core/gui/src/app/hub/component/about/about.component.scss b/frontend/src/app/hub/component/about/about.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/about/about.component.scss
rename to frontend/src/app/hub/component/about/about.component.scss
diff --git a/core/gui/src/app/hub/component/about/about.component.spec.ts b/frontend/src/app/hub/component/about/about.component.spec.ts
similarity index 91%
rename from core/gui/src/app/hub/component/about/about.component.spec.ts
rename to frontend/src/app/hub/component/about/about.component.spec.ts
index 0ae5b67bb68..3391ebf186e 100644
--- a/core/gui/src/app/hub/component/about/about.component.spec.ts
+++ b/frontend/src/app/hub/component/about/about.component.spec.ts
@@ -22,8 +22,6 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { AboutComponent } from "./about.component";
 import { UserService } from "../../../common/service/user/user.service";
 import { StubUserService } from "../../../common/service/user/stub-user.service";
-import { AdminUserService } from "../../../dashboard/service/admin/user/admin-user.service";
-import { AuthService } from "../../../common/service/user/auth.service";
 import { commonTestProviders } from "../../../common/testing/test-utils";
 
 describe("AboutComponent", () => {
diff --git a/core/gui/src/app/hub/component/about/about.component.ts b/frontend/src/app/hub/component/about/about.component.ts
similarity index 100%
rename from core/gui/src/app/hub/component/about/about.component.ts
rename to frontend/src/app/hub/component/about/about.component.ts
diff --git a/core/gui/src/app/hub/component/about/local-login/local-login.component.html b/frontend/src/app/hub/component/about/local-login/local-login.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/about/local-login/local-login.component.html
rename to frontend/src/app/hub/component/about/local-login/local-login.component.html
diff --git a/core/gui/src/app/hub/component/about/local-login/local-login.component.scss b/frontend/src/app/hub/component/about/local-login/local-login.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/about/local-login/local-login.component.scss
rename to frontend/src/app/hub/component/about/local-login/local-login.component.scss
diff --git a/core/gui/src/app/hub/component/about/local-login/local-login.component.ts b/frontend/src/app/hub/component/about/local-login/local-login.component.ts
similarity index 100%
rename from core/gui/src/app/hub/component/about/local-login/local-login.component.ts
rename to frontend/src/app/hub/component/about/local-login/local-login.component.ts
diff --git a/core/gui/src/app/hub/component/browse-section/browse-section.component.html b/frontend/src/app/hub/component/browse-section/browse-section.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/browse-section/browse-section.component.html
rename to frontend/src/app/hub/component/browse-section/browse-section.component.html
diff --git a/core/gui/src/app/hub/component/browse-section/browse-section.component.scss b/frontend/src/app/hub/component/browse-section/browse-section.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/browse-section/browse-section.component.scss
rename to frontend/src/app/hub/component/browse-section/browse-section.component.scss
diff --git a/core/gui/src/app/hub/component/browse-section/browse-section.component.spec.ts b/frontend/src/app/hub/component/browse-section/browse-section.component.spec.ts
similarity index 100%
rename from core/gui/src/app/hub/component/browse-section/browse-section.component.spec.ts
rename to frontend/src/app/hub/component/browse-section/browse-section.component.spec.ts
diff --git a/core/gui/src/app/hub/component/browse-section/browse-section.component.ts b/frontend/src/app/hub/component/browse-section/browse-section.component.ts
similarity index 96%
rename from core/gui/src/app/hub/component/browse-section/browse-section.component.ts
rename to frontend/src/app/hub/component/browse-section/browse-section.component.ts
index 3f370168c38..4527915f6ce 100644
--- a/core/gui/src/app/hub/component/browse-section/browse-section.component.ts
+++ b/frontend/src/app/hub/component/browse-section/browse-section.component.ts
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-import { ChangeDetectorRef, Component, Input, OnInit, OnChanges, SimpleChanges } from "@angular/core";
+import { ChangeDetectorRef, Component, Input, OnChanges, OnInit, SimpleChanges } from "@angular/core";
 import { DashboardEntry } from "../../../dashboard/type/dashboard-entry";
 import { WorkflowPersistService } from "../../../common/service/workflow-persist/workflow-persist.service";
 import { DatasetService } from "../../../dashboard/service/user/dataset/dataset.service";
-import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
+import { UntilDestroy } from "@ngneat/until-destroy";
 import {
+  DASHBOARD_HUB_DATASET_RESULT_DETAIL,
   DASHBOARD_HUB_WORKFLOW_RESULT_DETAIL,
-  DASHBOARD_USER_WORKSPACE,
   DASHBOARD_USER_DATASET,
-  DASHBOARD_HUB_DATASET_RESULT_DETAIL,
+  DASHBOARD_USER_WORKSPACE,
 } from "../../../app-routing.constant";
 
 @UntilDestroy()
diff --git a/core/gui/src/app/hub/component/hub-search-result/hub-search-result.component.html b/frontend/src/app/hub/component/hub-search-result/hub-search-result.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/hub-search-result/hub-search-result.component.html
rename to frontend/src/app/hub/component/hub-search-result/hub-search-result.component.html
diff --git a/core/gui/src/app/hub/component/hub-search-result/hub-search-result.component.scss b/frontend/src/app/hub/component/hub-search-result/hub-search-result.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/hub-search-result/hub-search-result.component.scss
rename to frontend/src/app/hub/component/hub-search-result/hub-search-result.component.scss
diff --git a/core/gui/src/app/hub/component/hub-search-result/hub-search-result.component.ts b/frontend/src/app/hub/component/hub-search-result/hub-search-result.component.ts
similarity index 100%
rename from core/gui/src/app/hub/component/hub-search-result/hub-search-result.component.ts
rename to frontend/src/app/hub/component/hub-search-result/hub-search-result.component.ts
diff --git a/core/gui/src/app/hub/component/hub.component.html b/frontend/src/app/hub/component/hub.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/hub.component.html
rename to frontend/src/app/hub/component/hub.component.html
diff --git a/core/gui/src/app/hub/component/hub.component.scss b/frontend/src/app/hub/component/hub.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/hub.component.scss
rename to frontend/src/app/hub/component/hub.component.scss
diff --git a/core/gui/src/app/hub/component/hub.component.ts b/frontend/src/app/hub/component/hub.component.ts
similarity index 100%
rename from core/gui/src/app/hub/component/hub.component.ts
rename to frontend/src/app/hub/component/hub.component.ts
index 6dd1dbe98f9..4cfdaf14094 100644
--- a/core/gui/src/app/hub/component/hub.component.ts
+++ b/frontend/src/app/hub/component/hub.component.ts
@@ -20,8 +20,8 @@
 import { Component, Input } from "@angular/core";
 import {
   DASHBOARD_HOME,
-  DASHBOARD_HUB_WORKFLOW_RESULT,
   DASHBOARD_HUB_DATASET_RESULT,
+  DASHBOARD_HUB_WORKFLOW_RESULT,
 } from "../../app-routing.constant";
 import { GuiConfigService } from "../../common/service/gui-config.service";
 import { SidebarTabs } from "../../common/type/gui-config";
diff --git a/core/gui/src/app/hub/component/landing-page/landing-page.component.html b/frontend/src/app/hub/component/landing-page/landing-page.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/landing-page/landing-page.component.html
rename to frontend/src/app/hub/component/landing-page/landing-page.component.html
diff --git a/core/gui/src/app/hub/component/landing-page/landing-page.component.scss b/frontend/src/app/hub/component/landing-page/landing-page.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/landing-page/landing-page.component.scss
rename to frontend/src/app/hub/component/landing-page/landing-page.component.scss
diff --git a/core/gui/src/app/hub/component/landing-page/landing-page.component.ts b/frontend/src/app/hub/component/landing-page/landing-page.component.ts
similarity index 96%
rename from core/gui/src/app/hub/component/landing-page/landing-page.component.ts
rename to frontend/src/app/hub/component/landing-page/landing-page.component.ts
index 3c5de079277..aec5103893d 100644
--- a/core/gui/src/app/hub/component/landing-page/landing-page.component.ts
+++ b/frontend/src/app/hub/component/landing-page/landing-page.component.ts
@@ -23,14 +23,13 @@ import { ActionType, EntityType, HubService } from "../../service/hub.service";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { Router } from "@angular/router";
 import { SearchService } from "../../../dashboard/service/user/search.service";
-import { DashboardEntry, UserInfo } from "../../../dashboard/type/dashboard-entry";
+import { DashboardEntry } from "../../../dashboard/type/dashboard-entry";
 import {
   DASHBOARD_HOME,
   DASHBOARD_HUB_DATASET_RESULT,
   DASHBOARD_HUB_WORKFLOW_RESULT,
 } from "../../../app-routing.constant";
 import { UserService } from "../../../common/service/user/user.service";
-import { SearchResultItem } from "../../../dashboard/type/search-result";
 
 @UntilDestroy()
 @Component({
diff --git a/core/gui/src/app/hub/component/type/hub-workflow.interface.ts b/frontend/src/app/hub/component/type/hub-workflow.interface.ts
similarity index 100%
rename from core/gui/src/app/hub/component/type/hub-workflow.interface.ts
rename to frontend/src/app/hub/component/type/hub-workflow.interface.ts
diff --git a/core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.html b/frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.html
similarity index 100%
rename from core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.html
rename to frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.html
diff --git a/core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.scss b/frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.scss
similarity index 100%
rename from core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.scss
rename to frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.scss
diff --git a/core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.ts b/frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.ts
similarity index 98%
rename from core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.ts
rename to frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.ts
index 2b6318fb535..3b0d0b8c502 100644
--- a/core/gui/src/app/hub/component/workflow/detail/hub-workflow-detail.component.ts
+++ b/frontend/src/app/hub/component/workflow/detail/hub-workflow-detail.component.ts
@@ -98,10 +98,10 @@ export class HubWorkflowDetailComponent implements AfterViewInit, OnDestroy, OnI
         this.viewCount = count;
       });
     this.workflowPersistService
-      .getOwnerUser(this.wid)
+      .getOwnerName(this.wid)
       .pipe(untilDestroyed(this))
-      .subscribe(owner => {
-        this.ownerName = owner.name;
+      .subscribe(ownerName => {
+        this.ownerName = ownerName;
       });
     this.workflowPersistService
       .getWorkflowName(this.wid)
diff --git a/core/gui/src/app/hub/service/hub.service.ts b/frontend/src/app/hub/service/hub.service.ts
similarity index 100%
rename from core/gui/src/app/hub/service/hub.service.ts
rename to frontend/src/app/hub/service/hub.service.ts
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.html b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.html
new file mode 100644
index 00000000000..a723f5789e1
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.html
@@ -0,0 +1,424 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- Agent Chat Container (used within tabs) -->
+<div class="agent-chat-container">
+  <!-- Toolbar -->
+  <div class="chat-toolbar">
+    <div class="chat-toolbar-controls">
+      <!-- Agent model info with state icon -->
+      <div class="toolbar-item">
+        <i
+          nz-icon
+          [nzType]="getStateIcon()"
+          [nzSpin]="isGenerating()"
+          nz-tooltip
+          [nzTooltipTitle]="getStateTooltip()"
+          [style.color]="getStateIconColor()"
+          style="font-size: 16px; margin-right: 6px; vertical-align: middle"></i>
+        <small style="color: #888"> Model: <strong>{{ agentInfo.modelType }}</strong> </small>
+        <button
+          nz-button
+          nzType="text"
+          nzSize="small"
+          (click)="showSystemInfo()"
+          nz-tooltip
+          nzTooltipTitle="View system prompt"
+          style="margin-left: 8px; padding: 0 4px">
+          <i
+            nz-icon
+            nzType="info-circle"
+            nzTheme="outline"></i>
+        </button>
+      </div>
+
+      <!-- Token counts -->
+      <div class="toolbar-item">
+        <small style="color: #888">
+          Tokens: <strong>{{ getTotalInputTokens() }}</strong> in / <strong>{{ getTotalOutputTokens() }}</strong> out
+        </small>
+      </div>
+
+      <!-- Clear button (when available) -->
+      <div class="toolbar-item">
+        <button
+          *ngIf="isAvailable()"
+          nz-button
+          nzType="text"
+          nzSize="small"
+          (click)="clearMessages()"
+          nz-tooltip
+          nzTooltipTitle="Clear chat history">
+          <i
+            nz-icon
+            nzType="delete"
+            nzTheme="outline"></i>
+        </button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Custom Chat Interface -->
+  <div class="chat-content-wrapper">
+    <!-- Messages List -->
+    <div
+      #messageContainer
+      class="messages-container">
+      <div
+        *ngFor="let response of responses; let i = index"
+        class="message"
+        [class.user-message]="response.role === 'user'"
+        [class.ai-message]="response.role === 'agent'">
+        <!-- Show header for user messages or when isBegin is true for agent messages -->
+        <div
+          class="message-header"
+          *ngIf="response.role === 'user' || response.isBegin">
+          <i
+            nz-icon
+            [nzType]="response.role === 'user' ? 'user' : 'robot'"
+            nzTheme="outline"></i>
+          <span class="message-role">{{ response.role === 'user' ? 'You' : agentInfo.name }}</span>
+        </div>
+
+        <!-- Message content with hover button -->
+        <div
+          class="message-content"
+          (mouseenter)="setHoveredMessage(i)"
+          (mouseleave)="setHoveredMessage(null)"
+          style="position: relative">
+          <div
+            *ngIf="response.content"
+            class="message-content">
+            <markdown [data]="response.content"></markdown>
+          </div>
+          <div
+            *ngIf="response.toolCalls && response.toolCalls.length > 0"
+            style="color: #8c8c8c; font-style: italic">
+            Execute {{ response.toolCalls.length }} tool{{ response.toolCalls.length > 1 ? 's' : '' }}
+          </div>
+
+          <!-- Details button (shown on hover) - only for agent messages with details -->
+          <button
+            *ngIf="response.role === 'agent' && hoveredMessageIndex === i && (response.toolCalls?.length || response.usage)"
+            nz-button
+            nzType="text"
+            nzSize="small"
+            (click)="showResponseDetails(response)"
+            style="position: absolute; top: 0; right: 0; opacity: 0.7"
+            nz-tooltip
+            nzTooltipTitle="View details">
+            <i
+              nz-icon
+              nzType="info-circle"
+              nzTheme="outline"></i>
+          </button>
+        </div>
+      </div>
+
+      <!-- Loading indicator -->
+      <div
+        *ngIf="isGenerating()"
+        class="message ai-message loading-message">
+        <div class="message-header">
+          <i
+            nz-icon
+            nzType="robot"
+            nzTheme="outline"></i>
+          <span class="message-role">{{ agentInfo.name }}</span>
+        </div>
+        <div class="message-content">
+          <nz-spin
+            nzSimple
+            nzSize="small"></nz-spin>
+          <span style="margin-left: 8px">Thinking...</span>
+        </div>
+      </div>
+    </div>
+
+    <!-- Input Area -->
+    <div class="input-area">
+      <textarea
+        #messageInput
+        nz-input
+        [(ngModel)]="currentMessage"
+        placeholder="Ask me anything about workflows..."
+        [nzAutosize]="{ minRows: 1, maxRows: 4 }"
+        (keydown.enter)="onEnterPress($any($event))"
+        [disabled]="!canSendMessage()"></textarea>
+      <button
+        nz-button
+        nzType="primary"
+        [disabled]="!currentMessage.trim() || !canSendMessage()"
+        (click)="sendMessage()">
+        <i
+          nz-icon
+          nzType="send"
+          nzTheme="outline"></i>
+      </button>
+      <button
+        *ngIf="isGenerating()"
+        nz-button
+        nzType="default"
+        nzDanger
+        (click)="stopGeneration()">
+        <i
+          nz-icon
+          nzType="stop"
+          nzTheme="outline"></i>
+      </button>
+    </div>
+  </div>
+
+  <!-- Connection Status -->
+  <div
+    *ngIf="!isConnected()"
+    class="connection-warning">
+    <i
+      nz-icon
+      nzType="warning"
+      nzTheme="fill"></i>
+    <span>Agent is disconnected. Please check your connection.</span>
+  </div>
+</div>
+
+<!-- Response Details Modal -->
+<nz-modal
+  [(nzVisible)]="isDetailsModalVisible"
+  nzTitle="Response Details"
+  nzWidth="800px"
+  (nzOnCancel)="closeDetailsModal()"
+  [nzFooter]="null">
+  <ng-container *nzModalContent>
+    <div
+      *ngIf="selectedResponse"
+      style="max-height: 600px; overflow-y: auto">
+      <!-- Token Usage Section -->
+      <div
+        *ngIf="selectedResponse.usage"
+        style="margin-bottom: 24px">
+        <h4 style="margin-bottom: 12px; color: #595959">
+          <i
+            nz-icon
+            nzType="bar-chart"
+            nzTheme="outline"
+            style="margin-right: 8px"></i>
+          Token Usage
+        </h4>
+        <nz-descriptions
+          nzBordered
+          nzSize="small"
+          [nzColumn]="2">
+          <nz-descriptions-item nzTitle="Input Tokens">
+            {{ selectedResponse.usage.inputTokens || 0 }}
+          </nz-descriptions-item>
+          <nz-descriptions-item nzTitle="Output Tokens">
+            {{ selectedResponse.usage.outputTokens || 0 }}
+          </nz-descriptions-item>
+          <nz-descriptions-item nzTitle="Total Tokens">
+            {{ selectedResponse.usage.totalTokens || 0 }}
+          </nz-descriptions-item>
+          <nz-descriptions-item nzTitle="Cached Tokens">
+            {{ selectedResponse.usage.cachedInputTokens || 0 }}
+          </nz-descriptions-item>
+        </nz-descriptions>
+      </div>
+
+      <!-- Tool Calls Section -->
+      <div *ngIf="selectedResponse.toolCalls && selectedResponse.toolCalls.length > 0">
+        <h4 style="margin-bottom: 12px; color: #595959">
+          <i
+            nz-icon
+            nzType="tool"
+            nzTheme="outline"
+            style="margin-right: 8px"></i>
+          Tool Calls ({{ selectedResponse.toolCalls.length }})
+        </h4>
+        <nz-collapse style="margin-bottom: 16px">
+          <nz-collapse-panel
+            *ngFor="let call of selectedResponse.toolCalls; let idx = index"
+            [nzHeader]="call.toolName"
+            [nzActive]="false">
+            <div style="background: #fafafa; padding: 12px; border-radius: 4px; margin-bottom: 12px">
+              <div style="margin-bottom: 8px">
+                <strong style="color: #595959">Arguments:</strong>
+              </div>
+              <pre
+                style="
+                  background: #fff;
+                  padding: 12px;
+                  border: 1px solid #d9d9d9;
+                  border-radius: 4px;
+                  overflow-x: auto;
+                  margin: 0;
+                "><code class="language-json">{{ formatJson(call.input || call.args) }}</code></pre>
+            </div>
+            <div
+              *ngIf="getToolResult(selectedResponse, idx)"
+              style="background: #fafafa; padding: 12px; border-radius: 4px">
+              <div style="margin-bottom: 8px">
+                <strong style="color: #595959">Result:</strong>
+              </div>
+              <pre
+                style="
+                  background: #fff;
+                  padding: 12px;
+                  border: 1px solid #d9d9d9;
+                  border-radius: 4px;
+                  overflow-x: auto;
+                  margin: 0;
+                "><code class="language-json">{{ formatJson(getToolResult(selectedResponse, idx)) }}</code></pre>
+            </div>
+            <div
+              *ngIf="getReActStepOperatorAccess(selectedResponse, idx)"
+              style="background: #fafafa; padding: 12px; border-radius: 4px; margin-top: 12px">
+              <div style="margin-bottom: 8px">
+                <strong style="color: #595959">Operator Access:</strong>
+              </div>
+              <div style="background: #fff; padding: 12px; border: 1px solid #d9d9d9; border-radius: 4px">
+                <div
+                  *ngIf="getReActStepOperatorAccess(selectedResponse, idx)!.viewedOperatorIds.length > 0"
+                  style="margin-bottom: 8px">
+                  <span style="color: #1890ff; font-weight: 500; margin-right: 8px">
+                    <i
+                      nz-icon
+                      nzType="eye"
+                      nzTheme="outline"
+                      style="margin-right: 4px"></i>
+                    VIEWED:
+                  </span>
+                  <nz-tag
+                    *ngFor="let opId of getReActStepOperatorAccess(selectedResponse, idx)!.viewedOperatorIds"
+                    [nzColor]="'blue'"
+                    style="margin: 2px; font-family: monospace; font-size: 12px">
+                    {{ opId }}
+                  </nz-tag>
+                </div>
+                <div *ngIf="getReActStepOperatorAccess(selectedResponse, idx)!.modifiedOperatorIds.length > 0">
+                  <span style="color: #52c41a; font-weight: 500; margin-right: 8px">
+                    <i
+                      nz-icon
+                      nzType="edit"
+                      nzTheme="outline"
+                      style="margin-right: 4px"></i>
+                    MODIFIED:
+                  </span>
+                  <nz-tag
+                    *ngFor="let opId of getReActStepOperatorAccess(selectedResponse, idx)!.modifiedOperatorIds"
+                    [nzColor]="'green'"
+                    style="margin: 2px; font-family: monospace; font-size: 12px">
+                    {{ opId }}
+                  </nz-tag>
+                </div>
+              </div>
+            </div>
+          </nz-collapse-panel>
+        </nz-collapse>
+      </div>
+
+      <!-- No Data Message -->
+      <div
+        *ngIf="!selectedResponse.usage && (!selectedResponse.toolCalls || selectedResponse.toolCalls.length === 0)"
+        style="text-align: center; padding: 40px; color: #8c8c8c">
+        <i
+          nz-icon
+          nzType="info-circle"
+          nzTheme="outline"
+          style="font-size: 32px; margin-bottom: 8px"></i>
+        <div>No additional details available for this response.</div>
+      </div>
+    </div>
+  </ng-container>
+</nz-modal>
+
+<!-- System Info Modal -->
+<nz-modal
+  [(nzVisible)]="isSystemInfoModalVisible"
+  nzTitle="Agent System Information"
+  nzWidth="900px"
+  (nzOnCancel)="closeSystemInfoModal()"
+  [nzFooter]="null">
+  <ng-container *nzModalContent>
+    <div style="max-height: 600px; overflow-y: auto">
+      <!-- System Prompt Section -->
+      <div style="margin-bottom: 24px">
+        <h4 style="margin-bottom: 12px; color: #595959">
+          <i
+            nz-icon
+            nzType="file-text"
+            nzTheme="outline"
+            style="margin-right: 8px"></i>
+          System Prompt
+        </h4>
+        <div
+          style="
+            background: #fafafa;
+            padding: 12px;
+            border-radius: 4px;
+            border: 1px solid #d9d9d9;
+            max-height: 300px;
+            overflow-y: auto;
+          ">
+          <markdown [data]="systemPrompt"></markdown>
+        </div>
+      </div>
+
+      <!-- Available Tools Section -->
+      <div>
+        <h4 style="margin-bottom: 12px; color: #595959">
+          <i
+            nz-icon
+            nzType="tool"
+            nzTheme="outline"
+            style="margin-right: 8px"></i>
+          Available Tools ({{ availableTools.length }})
+        </h4>
+        <nz-collapse>
+          <nz-collapse-panel
+            *ngFor="let tool of availableTools"
+            [nzHeader]="tool.name"
+            [nzActive]="false">
+            <!-- Tool Description -->
+            <div style="background: #fafafa; padding: 12px; border-radius: 4px; margin-bottom: 12px">
+              <div style="margin-bottom: 8px">
+                <strong style="color: #595959">Description:</strong>
+              </div>
+              <div style="color: #262626">{{ tool.description }}</div>
+            </div>
+
+            <!-- Tool Input Schema -->
+            <div style="background: #fafafa; padding: 12px; border-radius: 4px">
+              <div style="margin-bottom: 8px">
+                <strong style="color: #595959">Input Schema:</strong>
+              </div>
+              <pre
+                style="
+                  background: #fff;
+                  padding: 12px;
+                  border: 1px solid #d9d9d9;
+                  border-radius: 4px;
+                  overflow-x: auto;
+                  margin: 0;
+                "><code class="language-json">{{ formatJson(tool.inputSchema) }}</code></pre>
+            </div>
+          </nz-collapse-panel>
+        </nz-collapse>
+      </div>
+    </div>
+  </ng-container>
+</nz-modal>
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.scss b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.scss
new file mode 100644
index 00000000000..5c784194456
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.scss
@@ -0,0 +1,243 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.agent-chat-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  width: 100%;
+  background: white;
+}
+
+.chat-toolbar {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding: 8px 12px;
+  border-bottom: 1px solid #f0f0f0;
+  background: white;
+}
+
+.chat-toolbar-controls {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+  gap: 24px;
+}
+
+.toolbar-item {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+}
+
+.chat-toolbar-buttons {
+  display: flex;
+  gap: 4px;
+  align-items: center;
+  margin-left: 8px;
+}
+
+.chat-content-wrapper {
+  flex: 1;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.messages-container {
+  flex: 1;
+  overflow-y: auto;
+  padding: 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.message {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  max-width: 85%;
+
+  &.user-message {
+    align-self: flex-end;
+
+    .message-content {
+      background: #1890ff;
+      color: white;
+    }
+  }
+
+  &.ai-message {
+    align-self: flex-start;
+
+    .message-content {
+      background: #f5f5f5;
+      color: #262626;
+    }
+  }
+
+  &.loading-message {
+    .message-content {
+      background: #e6f7ff;
+      border: 1px solid #91d5ff;
+    }
+  }
+}
+
+.message-header {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 0 8px;
+  font-size: 12px;
+  color: #8c8c8c;
+
+  i {
+    font-size: 14px;
+  }
+}
+
+.message-content {
+  padding: 8px 12px;
+  border-radius: 6px;
+  line-height: 1.5;
+  word-wrap: break-word;
+  font-size: 14px;
+  user-select: text;
+
+  ::ng-deep markdown {
+    display: block;
+
+    p {
+      margin: 0 0 8px 0;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    code {
+      background: rgba(0, 0, 0, 0.06);
+      padding: 2px 6px;
+      border-radius: 3px;
+      font-size: 13px;
+    }
+
+    pre {
+      background: rgba(0, 0, 0, 0.06);
+      padding: 12px;
+      border-radius: 4px;
+      overflow-x: auto;
+      margin: 8px 0;
+
+      code {
+        background: transparent;
+        padding: 0;
+      }
+    }
+
+    ul,
+    ol {
+      margin: 8px 0;
+      padding-left: 24px;
+    }
+
+    li {
+      margin: 4px 0;
+    }
+
+    blockquote {
+      border-left: 3px solid rgba(0, 0, 0, 0.1);
+      padding-left: 12px;
+      margin: 8px 0;
+      color: rgba(0, 0, 0, 0.65);
+    }
+
+    a {
+      color: #1890ff;
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}
+
+.user-message .message-content ::ng-deep markdown {
+  code {
+    background: rgba(255, 255, 255, 0.2);
+    color: white;
+  }
+
+  pre {
+    background: rgba(255, 255, 255, 0.15);
+
+    code {
+      color: white;
+    }
+  }
+
+  blockquote {
+    border-left-color: rgba(255, 255, 255, 0.3);
+    color: rgba(255, 255, 255, 0.9);
+  }
+
+  a {
+    color: #e6f7ff;
+
+    &:hover {
+      color: white;
+    }
+  }
+}
+
+.input-area {
+  display: flex;
+  gap: 8px;
+  padding: 8px 12px;
+  border-top: 1px solid #f0f0f0;
+  background: #ffffff;
+
+  textarea {
+    flex: 1;
+  }
+
+  button {
+    align-self: flex-end;
+  }
+}
+
+.connection-warning {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 16px;
+  background: #fff7e6;
+  border-top: 1px solid #ffd666;
+  color: #d46b08;
+  font-size: 12px;
+
+  i {
+    color: #faad14;
+  }
+}
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.spec.ts b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.spec.ts
new file mode 100644
index 00000000000..a972d71c73f
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.spec.ts
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { HttpClientTestingModule } from "@angular/common/http/testing";
+import { AgentChatComponent } from "./agent-chat.component";
+import { TexeraCopilotManagerService } from "../../../service/copilot/texera-copilot-manager.service";
+import { NotificationService } from "../../../../common/service/notification/notification.service";
+import { commonTestProviders } from "../../../../common/testing/test-utils";
+import { NO_ERRORS_SCHEMA } from "@angular/core";
+
+describe("AgentChatComponent", () => {
+  let component: AgentChatComponent;
+  let fixture: ComponentFixture<AgentChatComponent>;
+  let mockCopilotManagerService: jasmine.SpyObj<TexeraCopilotManagerService>;
+  let mockNotificationService: jasmine.SpyObj<NotificationService>;
+
+  beforeEach(async () => {
+    mockCopilotManagerService = jasmine.createSpyObj("TexeraCopilotManagerService", [
+      "getAgentResponsesObservable",
+      "getAgentStateObservable",
+      "sendMessage",
+      "stopGeneration",
+      "clearMessages",
+      "getSystemInfo",
+    ]);
+    mockNotificationService = jasmine.createSpyObj("NotificationService", ["info", "error", "success"]);
+
+    await TestBed.configureTestingModule({
+      declarations: [AgentChatComponent],
+      imports: [HttpClientTestingModule],
+      providers: [
+        { provide: TexeraCopilotManagerService, useValue: mockCopilotManagerService },
+        { provide: NotificationService, useValue: mockNotificationService },
+        ...commonTestProviders,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AgentChatComponent);
+    component = fixture.componentInstance;
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.ts b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.ts
new file mode 100644
index 00000000000..99acf43effe
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.ts
@@ -0,0 +1,277 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component, ViewChild, ElementRef, Input, OnInit, AfterViewChecked } from "@angular/core";
+import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
+import { CopilotState, ReActStep } from "../../../service/copilot/texera-copilot";
+import { AgentInfo, TexeraCopilotManagerService } from "../../../service/copilot/texera-copilot-manager.service";
+import { NotificationService } from "../../../../common/service/notification/notification.service";
+
+@UntilDestroy()
+@Component({
+  selector: "texera-agent-chat",
+  templateUrl: "agent-chat.component.html",
+  styleUrls: ["agent-chat.component.scss"],
+})
+export class AgentChatComponent implements OnInit, AfterViewChecked {
+  @Input() agentInfo!: AgentInfo;
+  @ViewChild("messageContainer", { static: false }) messageContainer?: ElementRef;
+  @ViewChild("messageInput", { static: false }) messageInput?: ElementRef;
+
+  public responses: ReActStep[] = [];
+  public currentMessage = "";
+  private shouldScrollToBottom = false;
+  public isDetailsModalVisible = false;
+  public selectedResponse: ReActStep | null = null;
+  public hoveredMessageIndex: number | null = null;
+  public isSystemInfoModalVisible = false;
+  public systemPrompt: string = "";
+  public availableTools: Array<{ name: string; description: string; inputSchema: any }> = [];
+  public agentState: CopilotState = CopilotState.UNAVAILABLE;
+
+  constructor(
+    private copilotManagerService: TexeraCopilotManagerService,
+    private notificationService: NotificationService
+  ) {}
+
+  ngOnInit(): void {
+    if (!this.agentInfo) {
+      return;
+    }
+
+    // Subscribe to agent responses
+    this.copilotManagerService
+      .getReActStepsObservable(this.agentInfo.id)
+      .pipe(untilDestroyed(this))
+      .subscribe(responses => {
+        this.responses = responses;
+        this.shouldScrollToBottom = true;
+      });
+
+    // Subscribe to agent state changes
+    this.copilotManagerService
+      .getAgentStateObservable(this.agentInfo.id)
+      .pipe(untilDestroyed(this))
+      .subscribe(state => {
+        this.agentState = state;
+      });
+  }
+
+  ngAfterViewChecked(): void {
+    if (this.shouldScrollToBottom) {
+      this.scrollToBottom();
+      this.shouldScrollToBottom = false;
+    }
+  }
+
+  public setHoveredMessage(index: number | null): void {
+    this.hoveredMessageIndex = index;
+  }
+
+  public showResponseDetails(response: ReActStep): void {
+    this.selectedResponse = response;
+    this.isDetailsModalVisible = true;
+  }
+
+  public closeDetailsModal(): void {
+    this.isDetailsModalVisible = false;
+    this.selectedResponse = null;
+  }
+
+  public showSystemInfo(): void {
+    this.copilotManagerService
+      .getSystemInfo(this.agentInfo.id)
+      .pipe(untilDestroyed(this))
+      .subscribe(systemInfo => {
+        this.systemPrompt = systemInfo.systemPrompt;
+        this.availableTools = systemInfo.tools;
+        this.isSystemInfoModalVisible = true;
+      });
+  }
+
+  public closeSystemInfoModal(): void {
+    this.isSystemInfoModalVisible = false;
+  }
+
+  public formatJson(data: any): string {
+    return JSON.stringify(data, null, 2);
+  }
+
+  public getToolResult(response: ReActStep, toolCallIndex: number): any {
+    if (!response.toolResults || toolCallIndex >= response.toolResults.length) {
+      return null;
+    }
+    const toolResult = response.toolResults[toolCallIndex];
+    return toolResult.output || toolResult.result || toolResult;
+  }
+
+  public getReActStepOperatorAccess(
+    response: ReActStep,
+    toolCallIndex: number
+  ): { viewedOperatorIds: string[]; modifiedOperatorIds: string[] } | null {
+    if (!response.toolResults || toolCallIndex >= response.toolResults.length) {
+      return null;
+    }
+    const toolResult = response.toolResults[toolCallIndex];
+    const result = toolResult.output || toolResult.result || toolResult;
+
+    // Check if the result has operator access information
+    if (result && (result.viewedOperatorIds || result.modifiedOperatorIds)) {
+      return {
+        viewedOperatorIds: result.viewedOperatorIds || [],
+        modifiedOperatorIds: result.modifiedOperatorIds || [],
+      };
+    }
+
+    return null;
+  }
+
+  public getTotalInputTokens(): number {
+    // Iterate in reverse to find the most recent usage (already sorted by timestamp)
+    for (let i = this.responses.length - 1; i >= 0; i--) {
+      if (this.responses[i].usage?.inputTokens !== undefined) {
+        return this.responses[i].usage!.inputTokens!;
+      }
+    }
+    return 0;
+  }
+
+  public getTotalOutputTokens(): number {
+    // Iterate in reverse to find the most recent usage (already sorted by timestamp)
+    for (let i = this.responses.length - 1; i >= 0; i--) {
+      if (this.responses[i].usage?.outputTokens !== undefined) {
+        return this.responses[i].usage!.outputTokens!;
+      }
+    }
+    return 0;
+  }
+
+  /**
+   * Send a message to the agent via the copilot manager service.
+   */
+  public sendMessage(): void {
+    if (!this.currentMessage.trim() || !this.canSendMessage()) {
+      return;
+    }
+
+    const userMessage = this.currentMessage.trim();
+    this.currentMessage = "";
+
+    // Send to copilot via manager service
+    this.copilotManagerService
+      .sendMessage(this.agentInfo.id, userMessage)
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        error: (error: unknown) => {
+          this.notificationService.error(`Error sending message: ${error}`);
+        },
+      });
+  }
+
+  /**
+   * Check if messages can be sent (only when agent is available).
+   */
+  public canSendMessage(): boolean {
+    return this.agentState === CopilotState.AVAILABLE;
+  }
+
+  /**
+   * Get the NG-ZORRO icon type based on current agent state.
+   */
+  public getStateIcon(): string {
+    switch (this.agentState) {
+      case CopilotState.AVAILABLE:
+        return "check-circle";
+      case CopilotState.GENERATING:
+      case CopilotState.STOPPING:
+        return "sync";
+      case CopilotState.UNAVAILABLE:
+      default:
+        return "close-circle";
+    }
+  }
+
+  /**
+   * Get the icon color based on current agent state.
+   */
+  public getStateIconColor(): string {
+    switch (this.agentState) {
+      case CopilotState.AVAILABLE:
+        return "#52c41a";
+      case CopilotState.GENERATING:
+      case CopilotState.STOPPING:
+        return "#1890ff";
+      case CopilotState.UNAVAILABLE:
+      default:
+        return "#ff4d4f";
+    }
+  }
+
+  /**
+   * Get the tooltip text for the state icon.
+   */
+  public getStateTooltip(): string {
+    switch (this.agentState) {
+      case CopilotState.AVAILABLE:
+        return "Agent is ready";
+      case CopilotState.GENERATING:
+        return "Agent is generating response...";
+      case CopilotState.STOPPING:
+        return "Agent is stopping...";
+      case CopilotState.UNAVAILABLE:
+        return "Agent is unavailable";
+      default:
+        return "Agent status unknown";
+    }
+  }
+
+  public onEnterPress(event: KeyboardEvent): void {
+    if (!event.shiftKey) {
+      event.preventDefault();
+      this.sendMessage();
+    }
+  }
+
+  private scrollToBottom(): void {
+    if (this.messageContainer) {
+      const element = this.messageContainer.nativeElement;
+      element.scrollTop = element.scrollHeight;
+    }
+  }
+
+  public stopGeneration(): void {
+    this.copilotManagerService.stopGeneration(this.agentInfo.id).pipe(untilDestroyed(this)).subscribe();
+  }
+
+  public clearMessages(): void {
+    this.copilotManagerService.clearMessages(this.agentInfo.id).pipe(untilDestroyed(this)).subscribe();
+  }
+
+  public isGenerating(): boolean {
+    return this.agentState === CopilotState.GENERATING;
+  }
+
+  public isAvailable(): boolean {
+    return this.agentState === CopilotState.AVAILABLE;
+  }
+
+  public isConnected(): boolean {
+    return this.agentState !== CopilotState.UNAVAILABLE;
+  }
+}
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-panel.component.html b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.html
new file mode 100644
index 00000000000..4d419bd5764
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.html
@@ -0,0 +1,138 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- Docked Button -->
+<button
+  id="agent-docked-button"
+  nz-button
+  nzType="primary"
+  nzShape="circle"
+  nzSize="large"
+  (click)="openPanel()"
+  *ngIf="!width"
+  nz-tooltip
+  nzTooltipPlacement="left"
+  nzTooltipTitle="AI Agents">
+  <span
+    nz-icon
+    nzType="robot"></span>
+</button>
+
+<div
+  cdkDrag
+  cdkDragBoundary="texera-workspace"
+  id="agent-container"
+  class="box"
+  nz-resizable
+  [nzMinWidth]="400"
+  [nzMinHeight]="450"
+  [nzMaxWidth]="window.innerWidth * 0.9"
+  [nzMaxHeight]="window.innerHeight * 0.85"
+  [style.width.px]="width"
+  [style.height.px]="height"
+  (nzResize)="onResize($event)"
+  (cdkDragStarted)="handleDragStart()"
+  [cdkDragFreeDragPosition]="dragPosition">
+  <!-- Return and Minimize Buttons -->
+  <ul
+    id="return-button"
+    nz-menu
+    [ngClass]="{'shadow': !width}"
+    *ngIf="width">
+    <button
+      nz-button
+      nzType="text"
+      (click)="resetPanelPosition()"
+      *ngIf="!isDocked">
+      <span
+        nz-icon
+        nzType="enter"></span>
+    </button>
+    <li
+      nz-menu-item
+      (click)="openPanel()">
+      <span
+        nz-icon
+        nzType="minus"></span>
+    </li>
+  </ul>
+
+  <div
+    #content
+    id="content"
+    [hidden]="!width">
+    <h4
+      id="title"
+      cdkDragHandle>
+      AI Agents
+    </h4>
+
+    <!-- Tabs -->
+    <nz-tabset
+      [(nzSelectedIndex)]="selectedTabIndex"
+      class="agent-tabs"
+      nzType="card"
+      [nzTabBarExtraContent]="tabBarExtra">
+      <!-- Registration Tab -->
+      <nz-tab nzTitle="+ Agent">
+        <ng-template nz-tab>
+          <texera-agent-registration (agentCreated)="onAgentCreated($event)"></texera-agent-registration>
+        </ng-template>
+      </nz-tab>
+
+      <!-- Agent Tabs -->
+      <nz-tab
+        *ngFor="let agent of agents"
+        [nzTitle]="agentTabTitle">
+        <ng-template
+          #agentTabTitle
+          let-active="active">
+          <div class="agent-tab-title">
+            <span class="agent-tab-name">{{ agent.name }}</span>
+            <button
+              nz-button
+              nzType="text"
+              nzSize="small"
+              class="agent-tab-close"
+              (click)="deleteAgent(agent.id, $event)"
+              nz-tooltip
+              nzTooltipTitle="Close agent">
+              <i
+                nz-icon
+                nzType="close"
+                nzTheme="outline"></i>
+            </button>
+          </div>
+        </ng-template>
+        <ng-template nz-tab>
+          <texera-agent-chat [agentInfo]="agent"></texera-agent-chat>
+        </ng-template>
+      </nz-tab>
+    </nz-tabset>
+
+    <nz-resize-handles [nzDirections]="['left', 'bottom', 'bottomLeft']"></nz-resize-handles>
+  </div>
+</div>
+
+<!-- Tab Bar Extra Content Template -->
+<ng-template #tabBarExtra>
+  <div class="tab-bar-extra">
+    <span class="agent-count">{{ agents.length }} agent(s)</span>
+  </div>
+</ng-template>
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-panel.component.scss b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.scss
new file mode 100644
index 00000000000..3dc606bba65
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.scss
@@ -0,0 +1,164 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+:host {
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  z-index: 3;
+}
+
+#agent-container {
+  position: absolute;
+  top: calc(-100% + 80px);
+  right: 0;
+  z-index: 3;
+  background: white;
+}
+
+#title {
+  padding: 5px 9px;
+  border-bottom: 1px solid #e0e0e0;
+  position: absolute;
+  top: 0;
+  background: white;
+  width: 100%;
+  z-index: 2;
+}
+
+#agent-docked-button {
+  position: fixed;
+  bottom: 40px; // Position above the mini-map button
+  right: 10px;
+  z-index: 4;
+  box-shadow:
+    0 3px 1px -2px #0003,
+    0 2px 2px #00000024,
+    0 1px 5px #0000001f;
+}
+
+#return-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 3;
+  display: flex;
+}
+
+#content {
+  width: 100%;
+  height: 100%;
+  padding-top: 32px;
+  display: inline-block;
+  overflow-y: auto;
+}
+
+.shadow {
+  border-radius: 5px;
+  box-shadow:
+    0 3px 1px -2px #0003,
+    0 2px 2px #00000024,
+    0 1px 5px #0000001f;
+}
+
+.ant-menu-item {
+  margin: 0 !important;
+  height: 32px;
+  line-height: 32px;
+  padding: 0 9px;
+}
+
+.agent-tabs {
+  height: calc(100% - 32px); // Account for the title bar
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  ::ng-deep {
+    .ant-tabs {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .ant-tabs-nav {
+      margin-bottom: 0;
+    }
+
+    .ant-tabs-content-holder {
+      flex: 1;
+      overflow: hidden;
+    }
+
+    .ant-tabs-content {
+      height: 100%;
+    }
+
+    .ant-tabs-tabpane {
+      height: 100%;
+      overflow: hidden;
+      padding: 0;
+    }
+  }
+}
+
+.agent-tab-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  .agent-tab-name {
+    flex: 1;
+  }
+}
+
+.agent-tab-close {
+  padding: 0 !important;
+  width: 20px !important;
+  height: 20px !important;
+  min-width: 20px !important;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: 0.6;
+  margin-left: 4px;
+
+  &:hover {
+    opacity: 1;
+    color: #ff4d4f !important;
+    background: rgba(255, 77, 79, 0.1) !important;
+  }
+
+  i {
+    font-size: 12px;
+  }
+}
+
+.tab-bar-extra {
+  padding-right: 8px;
+}
+
+.agent-count {
+  font-size: 12px;
+  color: #8c8c8c;
+  padding: 4px 8px;
+  background: #f0f0f0;
+  border-radius: 4px;
+}
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-panel.component.ts b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.ts
new file mode 100644
index 00000000000..47e936ed31b
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.ts
@@ -0,0 +1,200 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component, HostListener, OnDestroy, OnInit } from "@angular/core";
+import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
+import { NzResizeEvent } from "ng-zorro-antd/resizable";
+import { TexeraCopilotManagerService, AgentInfo } from "../../service/copilot/texera-copilot-manager.service";
+import { calculateTotalTranslate3d } from "../../../common/util/panel-dock";
+
+@UntilDestroy()
+@Component({
+  selector: "texera-agent-panel",
+  templateUrl: "agent-panel.component.html",
+  styleUrls: ["agent-panel.component.scss"],
+})
+export class AgentPanelComponent implements OnInit, OnDestroy {
+  protected readonly window = window;
+  private static readonly MIN_PANEL_WIDTH = 400;
+  private static readonly MIN_PANEL_HEIGHT = 450;
+
+  // Panel dimensions and position
+  width: number = 0; // Start with 0 to show docked button
+  height = Math.max(AgentPanelComponent.MIN_PANEL_HEIGHT, window.innerHeight * 0.7);
+  id = -1;
+  dragPosition = { x: 0, y: 0 };
+  returnPosition = { x: 0, y: 0 };
+  isDocked = true;
+
+  // Tab management
+  selectedTabIndex: number = 0; // 0 = registration tab, 1 = action plans tab, 2+ = agent tabs
+  agents: AgentInfo[] = [];
+
+  constructor(private copilotManagerService: TexeraCopilotManagerService) {}
+
+  ngOnInit(): void {
+    this.loadPanelSettings();
+
+    // Subscribe to agent changes
+    this.copilotManagerService.agentChange$.pipe(untilDestroyed(this)).subscribe(() => {
+      this.copilotManagerService
+        .getAllAgents()
+        .pipe(untilDestroyed(this))
+        .subscribe(agents => {
+          this.agents = agents;
+        });
+    });
+
+    // Load initial agents
+    this.copilotManagerService
+      .getAllAgents()
+      .pipe(untilDestroyed(this))
+      .subscribe(agents => {
+        this.agents = agents;
+      });
+  }
+
+  @HostListener("window:beforeunload")
+  ngOnDestroy(): void {
+    this.savePanelSettings();
+  }
+
+  /**
+   * Open the panel from docked state
+   */
+  public openPanel(): void {
+    if (this.width === 0) {
+      // Open panel
+      this.width = AgentPanelComponent.MIN_PANEL_WIDTH;
+    } else {
+      // Close panel (dock it)
+      this.width = 0;
+      this.isDocked = true;
+    }
+  }
+
+  /**
+   * Handle agent creation
+   */
+  public onAgentCreated(agentId: string): void {
+    // The agent is already added to the agents array by the manager service
+    // Find the index of the newly created agent and switch to that tab
+    // Tab index 0 is registration, 1 is action plans, so agent tabs start at index 2
+    const agentIndex = this.agents.findIndex(agent => agent.id === agentId);
+    if (agentIndex !== -1) {
+      this.selectedTabIndex = agentIndex + 2; // +2 because tab 0 is registration, tab 1 is action plans
+    }
+  }
+
+  /**
+   * Delete an agent
+   */
+  public deleteAgent(agentId: string, event: Event): void {
+    event.stopPropagation(); // Prevent tab switch
+
+    if (confirm("Are you sure you want to delete this agent?")) {
+      const agentIndex = this.agents.findIndex(agent => agent.id === agentId);
+      this.copilotManagerService.deleteAgent(agentId);
+
+      // If we're on the deleted agent's tab, switch to registration
+      if (agentIndex !== -1 && this.selectedTabIndex === agentIndex + 2) {
+        this.selectedTabIndex = 0;
+      } else if (this.selectedTabIndex > agentIndex + 2) {
+        // Adjust selected index if we deleted a tab before the current one
+        this.selectedTabIndex--;
+      }
+    }
+  }
+
+  /**
+   * Handle panel resize
+   */
+  onResize({ width, height }: NzResizeEvent): void {
+    cancelAnimationFrame(this.id);
+    this.id = requestAnimationFrame(() => {
+      this.width = width!;
+      this.height = height!;
+    });
+  }
+
+  /**
+   * Reset panel to docked position
+   */
+  resetPanelPosition(): void {
+    this.dragPosition = { x: this.returnPosition.x, y: this.returnPosition.y };
+    this.isDocked = true;
+  }
+
+  /**
+   * Handle drag start
+   */
+  handleDragStart(): void {
+    this.isDocked = false;
+  }
+
+  /**
+   * Load panel settings from localStorage
+   */
+  private loadPanelSettings(): void {
+    const savedWidth = localStorage.getItem("agent-panel-width");
+    const savedHeight = localStorage.getItem("agent-panel-height");
+    const savedStyle = localStorage.getItem("agent-panel-style");
+    const savedDocked = localStorage.getItem("agent-panel-docked");
+
+    // Only restore width if the panel was not docked
+    if (savedDocked === "false" && savedWidth) {
+      const parsedWidth = Number(savedWidth);
+      if (!isNaN(parsedWidth) && parsedWidth >= AgentPanelComponent.MIN_PANEL_WIDTH) {
+        this.width = parsedWidth;
+      }
+    }
+
+    if (savedHeight) {
+      const parsedHeight = Number(savedHeight);
+      if (!isNaN(parsedHeight) && parsedHeight >= AgentPanelComponent.MIN_PANEL_HEIGHT) {
+        this.height = parsedHeight;
+      }
+    }
+
+    if (savedStyle) {
+      const container = document.getElementById("agent-container");
+      if (container) {
+        container.style.cssText = savedStyle;
+        const translates = container.style.transform;
+        const [xOffset, yOffset] = calculateTotalTranslate3d(translates);
+        this.returnPosition = { x: -xOffset, y: -yOffset };
+        this.isDocked = this.dragPosition.x === this.returnPosition.x && this.dragPosition.y === this.returnPosition.y;
+      }
+    }
+  }
+
+  /**
+   * Save panel settings to localStorage
+   */
+  private savePanelSettings(): void {
+    localStorage.setItem("agent-panel-width", String(this.width));
+    localStorage.setItem("agent-panel-height", String(this.height));
+    localStorage.setItem("agent-panel-docked", String(this.width === 0));
+
+    const container = document.getElementById("agent-container");
+    if (container) {
+      localStorage.setItem("agent-panel-style", container.style.cssText);
+    }
+  }
+}
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.html b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.html
new file mode 100644
index 00000000000..c31e8c3ef92
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.html
@@ -0,0 +1,101 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<div class="agent-registration-container">
+  <div class="registration-header">
+    <h3>Create New Agent</h3>
+    <p>Select a model type and create an AI agent to assist with your workflows</p>
+  </div>
+
+  <div class="model-type-selection">
+    <h4>Select Model Type</h4>
+    <div
+      *ngIf="isLoadingModels"
+      style="text-align: center; padding: 40px">
+      <nz-spin
+        nzSimple
+        nzSize="large"></nz-spin>
+      <p style="margin-top: 16px; color: #8c8c8c">Loading available models...</p>
+    </div>
+    <div
+      *ngIf="!isLoadingModels && modelTypes.length === 0"
+      style="text-align: center; padding: 40px">
+      <i
+        nz-icon
+        nzType="warning"
+        nzTheme="outline"
+        style="font-size: 48px; color: #faad14"></i>
+      <p style="margin-top: 16px; color: #8c8c8c">No models available</p>
+    </div>
+    <div
+      *ngIf="!isLoadingModels && modelTypes.length > 0"
+      class="model-cards">
+      <div
+        *ngFor="let modelType of modelTypes"
+        class="model-card"
+        [class.selected]="selectedModelType === modelType.id"
+        (click)="selectModelType(modelType.id)">
+        <div class="model-icon">
+          <i
+            nz-icon
+            [nzType]="modelType.icon"
+            nzTheme="outline"></i>
+        </div>
+        <div class="model-info">
+          <h5>{{ modelType.name }}</h5>
+          <p>{{ modelType.description }}</p>
+        </div>
+        <div
+          *ngIf="selectedModelType === modelType.id"
+          class="selected-indicator">
+          <i
+            nz-icon
+            nzType="check-circle"
+            nzTheme="fill"></i>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="agent-name-input">
+    <h4>Agent Name (Optional)</h4>
+    <input
+      nz-input
+      [(ngModel)]="customAgentName"
+      placeholder="Enter a custom name for your agent"
+      [disabled]="!selectedModelType" />
+  </div>
+
+  <div class="action-buttons">
+    <button
+      nz-button
+      nzType="primary"
+      nzSize="large"
+      [nzLoading]="isCreating"
+      [disabled]="!canCreate()"
+      (click)="createAgent()">
+      <i
+        *ngIf="!isCreating"
+        nz-icon
+        nzType="plus-circle"
+        nzTheme="outline"></i>
+      {{ isCreating ? 'Creating...' : 'Create Agent' }}
+    </button>
+  </div>
+</div>
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.scss b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.scss
new file mode 100644
index 00000000000..639dcb78eb0
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.scss
@@ -0,0 +1,147 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.agent-registration-container {
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+  padding: 20px;
+  height: 100%;
+  overflow-y: auto;
+}
+
+.registration-header {
+  text-align: center;
+
+  h3 {
+    margin: 0 0 8px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: #262626;
+  }
+
+  p {
+    margin: 0;
+    font-size: 14px;
+    color: #8c8c8c;
+  }
+}
+
+.model-type-selection {
+  h4 {
+    margin: 0 0 12px 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #262626;
+  }
+}
+
+.model-cards {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.model-card {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 16px;
+  border: 2px solid #d9d9d9;
+  border-radius: 8px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  position: relative;
+
+  &:hover {
+    border-color: #1890ff;
+    box-shadow: 0 2px 8px rgba(24, 144, 255, 0.2);
+  }
+
+  &.selected {
+    border-color: #1890ff;
+    background: #e6f7ff;
+    box-shadow: 0 2px 8px rgba(24, 144, 255, 0.3);
+  }
+}
+
+.model-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 48px;
+  height: 48px;
+  background: #f0f0f0;
+  border-radius: 8px;
+  flex-shrink: 0;
+
+  i {
+    font-size: 28px;
+    color: #1890ff;
+  }
+}
+
+.model-info {
+  flex: 1;
+
+  h5 {
+    margin: 0 0 4px 0;
+    font-size: 15px;
+    font-weight: 600;
+    color: #262626;
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: #8c8c8c;
+    line-height: 1.4;
+  }
+}
+
+.selected-indicator {
+  flex-shrink: 0;
+
+  i {
+    font-size: 24px;
+    color: #1890ff;
+  }
+}
+
+.agent-name-input {
+  h4 {
+    margin: 0 0 8px 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #262626;
+  }
+
+  input {
+    width: 100%;
+  }
+}
+
+.action-buttons {
+  display: flex;
+  justify-content: center;
+
+  button {
+    min-width: 200px;
+  }
+}
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.ts b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.ts
new file mode 100644
index 00000000000..4d9b69706e5
--- /dev/null
+++ b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.ts
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from "@angular/core";
+import { TexeraCopilotManagerService, ModelType } from "../../../service/copilot/texera-copilot-manager.service";
+import { NotificationService } from "../../../../common/service/notification/notification.service";
+import { Subject, takeUntil } from "rxjs";
+
+@Component({
+  selector: "texera-agent-registration",
+  templateUrl: "agent-registration.component.html",
+  styleUrls: ["agent-registration.component.scss"],
+})
+export class AgentRegistrationComponent implements OnInit, OnDestroy {
+  @Output() agentCreated = new EventEmitter<string>();
+
+  public modelTypes: ModelType[] = [];
+  public selectedModelType: string | null = null;
+  public customAgentName: string = "";
+  public isLoadingModels: boolean = false;
+  public hasLoadingError: boolean = false;
+
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private copilotManagerService: TexeraCopilotManagerService,
+    private notificationService: NotificationService
+  ) {}
+
+  ngOnInit(): void {
+    this.isLoadingModels = true;
+    this.hasLoadingError = false;
+
+    this.copilotManagerService
+      .fetchModelTypes()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: models => {
+          this.modelTypes = models;
+          this.isLoadingModels = false;
+          if (models.length === 0) {
+            this.hasLoadingError = true;
+            this.notificationService.error("No models available. Please check the LiteLLM configuration.");
+          }
+        },
+        error: (error: unknown) => {
+          this.isLoadingModels = false;
+          this.hasLoadingError = true;
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          this.notificationService.error(`Failed to fetch models: ${errorMessage}`);
+        },
+      });
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  public selectModelType(modelTypeId: string): void {
+    this.selectedModelType = modelTypeId;
+  }
+
+  public isCreating: boolean = false;
+
+  /**
+   * Create a new agent with the selected model type.
+   */
+  public createAgent(): void {
+    if (!this.selectedModelType || this.isCreating) {
+      return;
+    }
+
+    this.isCreating = true;
+
+    this.copilotManagerService
+      .createAgent(this.selectedModelType, this.customAgentName || undefined)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: agentInfo => {
+          this.agentCreated.emit(agentInfo.id);
+          this.selectedModelType = null;
+          this.customAgentName = "";
+          this.isCreating = false;
+        },
+        error: (error: unknown) => {
+          this.notificationService.error(`Failed to create agent: ${error}`);
+          this.isCreating = false;
+        },
+      });
+  }
+
+  public canCreate(): boolean {
+    return this.selectedModelType !== null && !this.isCreating;
+  }
+}
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.html b/frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.html
rename to frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.html
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.scss b/frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.scss
rename to frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.scss
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.ts b/frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.ts
similarity index 95%
rename from core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.ts
index ad0d17ae362..c0b85a00c32 100644
--- a/core/gui/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.ts
+++ b/frontend/src/app/workspace/component/code-editor-dialog/annotation-suggestion.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component, Input, Output, EventEmitter } from "@angular/core";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 @Component({
   selector: "texera-annotation-suggestion",
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.html b/frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.html
rename to frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.html
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.scss b/frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.scss
rename to frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.scss
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.spec.ts b/frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.spec.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.ts b/frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.ts
similarity index 95%
rename from core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.ts
index 6d66e4a6ea4..ac588e801e7 100644
--- a/core/gui/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.ts
+++ b/frontend/src/app/workspace/component/code-editor-dialog/breakpoint-condition-input/breakpoint-condition-input.component.ts
@@ -17,18 +17,7 @@
  * under the License.
  */
 
-import {
-  AfterViewChecked,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostListener,
-  Input,
-  OnChanges,
-  Output,
-  SimpleChanges,
-  ViewChild,
-} from "@angular/core";
+import { Component, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges } from "@angular/core";
 import { UdfDebugService } from "../../../service/operator-debug/udf-debug.service";
 import { isDefined } from "../../../../common/util/predicate";
 import { MonacoEditor } from "monaco-breakpoints/dist/types";
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-debugger.component.html b/frontend/src/app/workspace/component/code-editor-dialog/code-debugger.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-debugger.component.html
rename to frontend/src/app/workspace/component/code-editor-dialog/code-debugger.component.html
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-debugger.component.spec.ts b/frontend/src/app/workspace/component/code-editor-dialog/code-debugger.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-debugger.component.spec.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/code-debugger.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-debugger.component.ts b/frontend/src/app/workspace/component/code-editor-dialog/code-debugger.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-debugger.component.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/code-debugger.component.ts
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.html b/frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.html
rename to frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.html
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.scss b/frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.scss
rename to frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.scss
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.spec.ts b/frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.spec.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.ts b/frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.ts
similarity index 96%
rename from core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.ts
rename to frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.ts
index fe1d920ac8d..18ebfc59a1f 100644
--- a/core/gui/src/app/workspace/component/code-editor-dialog/code-editor.component.ts
+++ b/frontend/src/app/workspace/component/code-editor-dialog/code-editor.component.ts
@@ -17,7 +17,16 @@
  * under the License.
  */
 
-import { AfterViewInit, Component, ComponentRef, ElementRef, OnDestroy, Type, ViewChild } from "@angular/core";
+import {
+  AfterViewInit,
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  Type,
+  ViewChild,
+  HostListener,
+} from "@angular/core";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { WorkflowActionService } from "../../service/workflow-graph/model/workflow-action.service";
 import { WorkflowVersionService } from "../../../dashboard/service/user/workflow-version/workflow-version.service";
@@ -516,6 +525,24 @@ export class CodeEditorComponent implements AfterViewInit, SafeStyle, OnDestroy
     this.code?.insert(insertOffset, annotations);
   }
 
+  @HostListener("window:resize")
+  onWindowResize() {
+    this.adjustEditorSize();
+  }
+
+  private adjustEditorSize(): void {
+    const container = this.containerElement.nativeElement;
+    const viewportWidth = window.innerWidth;
+    const viewportHeight = window.innerHeight;
+    const rect = container.getBoundingClientRect();
+    if (rect.right > viewportWidth) {
+      container.style.width = `${viewportWidth - rect.left}px`;
+    }
+    if (rect.bottom > viewportHeight) {
+      container.style.height = `${viewportHeight - rect.top}px`;
+    }
+    this.editorWrapper.getEditor()?.layout();
+  }
   onFocus() {
     this.workflowActionService.getJointGraphWrapper().highlightOperators(this.currentOperatorId);
   }
diff --git a/core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.html b/frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.html
rename to frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.html
diff --git a/core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.scss b/frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.scss
rename to frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.scss
diff --git a/core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.spec.ts b/frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.spec.ts
rename to frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.ts b/frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.ts
similarity index 97%
rename from core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.ts
rename to frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.ts
index 203232f9b21..9c4a7d71ef0 100644
--- a/core/gui/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.ts
+++ b/frontend/src/app/workspace/component/codearea-custom-template/codearea-custom-template.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Component, ComponentRef, ChangeDetectorRef, OnInit, OnDestroy } from "@angular/core";
+import { ChangeDetectorRef, Component, ComponentRef, OnDestroy, OnInit } from "@angular/core";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { FieldType, FieldTypeConfig } from "@ngx-formly/core";
 import { CodeEditorComponent } from "../code-editor-dialog/code-editor.component";
diff --git a/core/gui/src/app/workspace/component/file-selection/file-selection.component.html b/frontend/src/app/workspace/component/file-selection/file-selection.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/file-selection/file-selection.component.html
rename to frontend/src/app/workspace/component/file-selection/file-selection.component.html
diff --git a/core/gui/src/app/workspace/component/file-selection/file-selection.component.scss b/frontend/src/app/workspace/component/file-selection/file-selection.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/file-selection/file-selection.component.scss
rename to frontend/src/app/workspace/component/file-selection/file-selection.component.scss
diff --git a/core/gui/src/app/workspace/component/file-selection/file-selection.component.ts b/frontend/src/app/workspace/component/file-selection/file-selection.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/file-selection/file-selection.component.ts
rename to frontend/src/app/workspace/component/file-selection/file-selection.component.ts
diff --git a/core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.html b/frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.html
rename to frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.html
diff --git a/core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.scss b/frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.scss
rename to frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.scss
diff --git a/core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.spec.ts b/frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.spec.ts
rename to frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.ts b/frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.ts
similarity index 96%
rename from core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.ts
rename to frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.ts
index 0d510624d9e..38839f377e5 100644
--- a/core/gui/src/app/workspace/component/input-autocomplete/input-autocomplete.component.ts
+++ b/frontend/src/app/workspace/component/input-autocomplete/input-autocomplete.component.ts
@@ -68,7 +68,7 @@ export class InputAutoCompleteComponent extends FieldType<FieldTypeConfig> {
   }
 
   get enableDatasetSource(): boolean {
-    return this.config.env.userSystemEnabled && this.config.env.selectingFilesFromDatasetsEnabled;
+    return this.config.env.selectingFilesFromDatasetsEnabled;
   }
 
   get isFileSelectionEnabled(): boolean {
diff --git a/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html b/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html
new file mode 100644
index 00000000000..a79db1ab2b4
--- /dev/null
+++ b/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html
@@ -0,0 +1,61 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<div
+  class="draggable-panel"
+  *ngIf="isVisible"
+  cdkDrag
+  cdkDragBoundary="texera-workspace"
+  cdkDragHandle=".panel-header">
+  <div
+    class="panel-header"
+    cdkDragHandle>
+    <span>Jupyter Notebook</span>
+    <div class="panel-buttons">
+      <!-- Minimize button -->
+      <button
+        class="minimize-button"
+        (click)="minimizePanel()">
+        <i
+          nz-icon
+          nzType="minus"
+          nzTheme="outline"></i>
+      </button>
+      <!-- Close button -->
+      <button
+        class="close-button"
+        (click)="closePanel()">
+        <i
+          nz-icon
+          nzType="close"
+          nzTheme="outline"></i>
+      </button>
+    </div>
+  </div>
+
+  <div class="iframe-container">
+    <iframe
+      #iframeRef
+      [src]="jupyterUrl"
+      title="Jupyter Notebook"
+      width="100%"
+      height="100%"
+      style="border: none"></iframe>
+  </div>
+</div>
diff --git a/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss b/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss
new file mode 100644
index 00000000000..960b77a063e
--- /dev/null
+++ b/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.draggable-panel {
+  position: absolute;
+  top: 200px;
+  left: 200px;
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  z-index: 1000;
+  resize: both;
+  overflow: auto;
+}
+
+.panel-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #007bff;
+  color: white;
+  padding: 10px;
+  font-weight: bold;
+  text-align: center;
+  cursor: move;
+}
+
+.panel-buttons {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.minimize-button,
+.close-button {
+  background: none;
+  border: none;
+  color: white;
+  font-size: 16px;
+  cursor: pointer;
+}
+
+.minimize-button:hover {
+  color: royalblue;
+}
+
+.close-button:hover {
+  color: royalblue;
+}
+
+.iframe-container {
+  width: 100%;
+  height: calc(100% - 40px); /* Adjust height for the header */
+}
+
+.iframe-container iframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+}
diff --git a/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts b/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts
new file mode 100644
index 00000000000..957e04fbac3
--- /dev/null
+++ b/frontend/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component, ElementRef, OnDestroy, OnInit, ViewChild, AfterViewInit } from "@angular/core";
+import { JupyterPanelService } from "../../service/jupyter-panel/jupyter-panel.service";
+import { Subject } from "rxjs";
+import { takeUntil } from "rxjs/operators";
+import { environment } from "../../../../environments/environment";
+import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
+
+@Component({
+  selector: "texera-jupyter-notebook-panel",
+  templateUrl: "./jupyter-notebook-panel.component.html",
+  styleUrls: ["./jupyter-notebook-panel.component.scss"],
+})
+export class JupyterNotebookPanelComponent implements OnInit, AfterViewInit, OnDestroy {
+  @ViewChild("iframeRef", { static: false }) iframeRef!: ElementRef<HTMLIFrameElement>; // Use static: false
+
+  isVisible: boolean = false; // Initialize to false, meaning the panel is hidden by default
+  jupyterUrl: SafeResourceUrl = ""; // Store the notebook URL dynamically
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private jupyterPanelService: JupyterPanelService,
+    private sanitizer: DomSanitizer
+  ) {}
+
+  ngOnInit(): void {
+    // Subscribe to the visibility state of the panel
+    this.jupyterPanelService.jupyterNotebookPanelVisible$
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((visible: boolean) => {
+        this.isVisible = visible;
+
+        if (this.isVisible) {
+          // The iframe only exists once the panel is visible (because of *ngIf)
+          const url = `${environment.jupyterAPIUrl}/notebooks/work/notebook.ipynb?token=mytoken`;
+          this.jupyterUrl = this.sanitizer.bypassSecurityTrustResourceUrl(url);
+          this.checkIframeRef();
+        }
+      });
+  }
+
+  ngAfterViewInit(): void {
+    // Ensure iframe is handled after it's available in the DOM
+    this.checkIframeRef();
+  }
+
+  checkIframeRef(): void {
+    setTimeout(() => {
+      if (this.isVisible && this.iframeRef?.nativeElement) {
+        console.log("Iframe reference found:", this.iframeRef.nativeElement);
+        this.jupyterPanelService.setIframeRef(this.iframeRef.nativeElement);
+      } else {
+        console.error("Iframe reference not found yet.");
+      }
+    }, 0); // Small timeout to ensure DOM is updated
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete(); // Cleanup subscriptions to avoid memory leaks
+  }
+
+  // Close the panel by invoking the service method
+  closePanel(): void {
+    this.jupyterPanelService.closeJupyterNotebookPanel();
+  }
+
+  // Minimize the jupyter notebook by invoking the service method
+  minimizePanel(): void {
+    this.isVisible = false;
+    this.jupyterPanelService.minimizeJupyterNotebookPanel();
+  }
+}
diff --git a/core/gui/src/app/workspace/component/left-panel/environment/environment.component.ts b/frontend/src/app/workspace/component/left-panel/environment/environment.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/environment/environment.component.ts
rename to frontend/src/app/workspace/component/left-panel/environment/environment.component.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/left-panel.component.html b/frontend/src/app/workspace/component/left-panel/left-panel.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/left-panel.component.html
rename to frontend/src/app/workspace/component/left-panel/left-panel.component.html
diff --git a/core/gui/src/app/workspace/component/left-panel/left-panel.component.scss b/frontend/src/app/workspace/component/left-panel/left-panel.component.scss
similarity index 98%
rename from core/gui/src/app/workspace/component/left-panel/left-panel.component.scss
rename to frontend/src/app/workspace/component/left-panel/left-panel.component.scss
index 045deb84208..84d962936c9 100644
--- a/core/gui/src/app/workspace/component/left-panel/left-panel.component.scss
+++ b/frontend/src/app/workspace/component/left-panel/left-panel.component.scss
@@ -30,7 +30,6 @@
   top: calc(-100% + 80px);
   left: 0;
   z-index: 3;
-  user-select: none;
   background: white;
 }
 
diff --git a/core/gui/src/app/workspace/component/left-panel/left-panel.component.spec.ts b/frontend/src/app/workspace/component/left-panel/left-panel.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/left-panel.component.spec.ts
rename to frontend/src/app/workspace/component/left-panel/left-panel.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/left-panel.component.ts b/frontend/src/app/workspace/component/left-panel/left-panel.component.ts
similarity index 96%
rename from core/gui/src/app/workspace/component/left-panel/left-panel.component.ts
rename to frontend/src/app/workspace/component/left-panel/left-panel.component.ts
index 6c8f32c4b9e..8dd9a5748b8 100644
--- a/core/gui/src/app/workspace/component/left-panel/left-panel.component.ts
+++ b/frontend/src/app/workspace/component/left-panel/left-panel.component.ts
@@ -29,6 +29,7 @@ import { SettingsComponent } from "./settings/settings.component";
 import { calculateTotalTranslate3d } from "../../../common/util/panel-dock";
 import { PanelService } from "../../service/panel/panel.service";
 import { GuiConfigService } from "../../../common/service/gui-config.service";
+
 @UntilDestroy()
 @Component({
   selector: "texera-left-panel",
@@ -49,7 +50,7 @@ export class LeftPanelComponent implements OnDestroy, OnInit, AfterViewInit {
   items = [
     { component: null, title: "", icon: "", enabled: true },
     { component: OperatorMenuComponent, title: "Operators", icon: "appstore", enabled: true },
-    { component: VersionsListComponent, title: "Versions", icon: "schedule", enabled: false },
+    { component: VersionsListComponent, title: "Versions", icon: "schedule", enabled: true },
     {
       component: SettingsComponent,
       title: "Settings",
@@ -93,9 +94,8 @@ export class LeftPanelComponent implements OnDestroy, OnInit, AfterViewInit {
   }
 
   private updateItemsWithConfig(): void {
-    this.items[2].enabled = this.config.env.userSystemEnabled; // Versions
     this.items[4].enabled = this.config.env.workflowExecutionsTrackingEnabled; // Execution History
-    this.items[5].enabled = this.config.env.userSystemEnabled && this.config.env.timetravelEnabled; // Time Travel
+    this.items[5].enabled = this.config.env.timetravelEnabled; // Time Travel
   }
 
   ngOnInit(): void {
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.html b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.html
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.html
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.scss b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.scss
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.scss
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.spec.ts b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.spec.ts
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.ts b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.ts
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-label/operator-label.component.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.html b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.html
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.html
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.scss b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.scss
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.scss
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.spec.ts b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.spec.ts
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.ts b/frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.ts
rename to frontend/src/app/workspace/component/left-panel/operator-menu/operator-menu.component.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/settings/settings.component.html b/frontend/src/app/workspace/component/left-panel/settings/settings.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/settings/settings.component.html
rename to frontend/src/app/workspace/component/left-panel/settings/settings.component.html
diff --git a/core/gui/src/app/workspace/component/left-panel/settings/settings.component.scss b/frontend/src/app/workspace/component/left-panel/settings/settings.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/settings/settings.component.scss
rename to frontend/src/app/workspace/component/left-panel/settings/settings.component.scss
diff --git a/core/gui/src/app/workspace/component/left-panel/settings/settings.component.spec.ts b/frontend/src/app/workspace/component/left-panel/settings/settings.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/settings/settings.component.spec.ts
rename to frontend/src/app/workspace/component/left-panel/settings/settings.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/settings/settings.component.ts b/frontend/src/app/workspace/component/left-panel/settings/settings.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/settings/settings.component.ts
rename to frontend/src/app/workspace/component/left-panel/settings/settings.component.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.html b/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.html
rename to frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.html
diff --git a/core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.scss b/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.scss
rename to frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.scss
diff --git a/core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts b/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts
rename to frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.ts b/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/time-travel/time-travel.component.ts
rename to frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.html b/frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.html
rename to frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.html
diff --git a/core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.scss b/frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.scss
rename to frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.scss
diff --git a/core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.spec.ts b/frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.spec.ts
rename to frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.ts b/frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/left-panel/versions-list/versions-list.component.ts
rename to frontend/src/app/workspace/component/left-panel/versions-list/versions-list.component.ts
diff --git a/core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.css b/frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.css
similarity index 100%
rename from core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.css
rename to frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.css
diff --git a/core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.html b/frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.html
rename to frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.html
diff --git a/core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.spec.ts b/frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.spec.ts
rename to frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.ts b/frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.ts
rename to frontend/src/app/workspace/component/menu/coeditor-user-icon/coeditor-user-icon.component.ts
diff --git a/core/gui/src/app/workspace/component/menu/menu.component.html b/frontend/src/app/workspace/component/menu/menu.component.html
similarity index 85%
rename from core/gui/src/app/workspace/component/menu/menu.component.html
rename to frontend/src/app/workspace/component/menu/menu.component.html
index e212169321f..882f7f6d1d0 100644
--- a/core/gui/src/app/workspace/component/menu/menu.component.html
+++ b/frontend/src/app/workspace/component/menu/menu.component.html
@@ -18,20 +18,8 @@
 -->
 
 <div id="menu-container">
-  <div
-    *ngIf="!this.config.env.userSystemEnabled"
-    id="logo">
-    <a href="{{this.config.env.userSystemEnabled?'/dashboard/workflow':'/'}}">
-      <img
-        alt="Texera"
-        height="{{this.config.env.userSystemEnabled?75:38}}"
-        src="assets/logos/full_logo_small.png" />
-    </a>
-  </div>
   <div id="menu-content">
-    <div
-      id="menu-user"
-      *ngIf="this.config.env.userSystemEnabled">
+    <div id="menu-user">
       <div id="metadata">
         <button
           (click)="closeParticularVersionDisplay()"
@@ -99,7 +87,6 @@
         *ngIf="!displayParticularWorkflowVersion">
         <a [routerLink]="DASHBOARD_USER_WORKFLOW">
           <button
-            *ngIf="this.config.env.userSystemEnabled"
             nz-button
             title="dashboard">
             <i
@@ -109,7 +96,6 @@
         </a>
         <button
           (click)="onClickCreateNewWorkflow()"
-          *ngIf="this.config.env.userSystemEnabled"
           nz-button
           title="create new">
           <i
@@ -118,7 +104,6 @@
         </button>
         <button
           (click)="persistWorkflow()"
-          *ngIf="this.config.env.userSystemEnabled"
           [disabled]="!userService.isLogin() || isSaving || !isWorkflowModifiable"
           nz-button
           title="save">
@@ -156,9 +141,59 @@
             nz-icon
             nzType="download"></i>
         </button>
+        <nz-upload
+          [nzDisabled]="!isWorkflowModifiable"
+          [nzBeforeUpload]="onClickImportNotebook">
+          <button
+            nz-button
+            [disabled]="!isWorkflowModifiable"
+            title="AI Generate Workflow">
+            <i
+              nz-icon
+              nzType="robot"></i>
+          </button>
+        </nz-upload>
       </nz-button-group>
       <ng-template #utilities>
         <nz-button-group>
+          <button
+            nz-dropdown
+            [nzDropdownMenu]="menu"
+            [nzClickHide]="false"
+            nz-button
+            title="Layers">
+            <i
+              nz-icon
+              nzType="block"></i>
+          </button>
+          <nz-dropdown-menu #menu="nzDropdownMenu">
+            <ul nz-menu>
+              <li nz-menu-item>
+                <label
+                  nz-checkbox
+                  [(ngModel)]="showGrid"
+                  (ngModelChange)="toggleGrid()"
+                  >Grid</label
+                >
+              </li>
+              <li nz-menu-item>
+                <label
+                  nz-checkbox
+                  [(ngModel)]="showRegion"
+                  (ngModelChange)="toggleRegion()"
+                  >Regions</label
+                >
+              </li>
+              <li nz-menu-item>
+                <label
+                  nz-checkbox
+                  [(ngModel)]="showNumWorkers"
+                  (ngModelChange)="toggleNumWorkers()"
+                  >Workers</label
+                >
+              </li>
+            </ul>
+          </nz-dropdown-menu>
           <button
             (click)="onClickClosePanels()"
             nz-button
@@ -183,14 +218,6 @@
               nz-icon
               nzType="printer"></i>
           </button>
-          <button
-            (click)="onClickToggleGrids()"
-            nz-button
-            title="Toggle Grids">
-            <i
-              nz-icon
-              nzType="border-outer"></i>
-          </button>
           <button
             (click)="onClickRestoreZoomOffsetDefault()"
             nz-button
@@ -291,22 +318,22 @@
               nzType="database"
               nzTheme="twotone"></i>
           </button>
-          <!--          <button-->
-          <!--            (click)="undoRedoService.undoAction()"-->
-          <!--            [disabled]="displayParticularWorkflowVersion || !undoRedoService.canUndo()"-->
-          <!--            nz-button>-->
-          <!--            <i-->
-          <!--              nz-icon-->
-          <!--              nzType="undo"></i>-->
-          <!--          </button>-->
-          <!--          <button-->
-          <!--            (click)="undoRedoService.redoAction()"-->
-          <!--            [disabled]="displayParticularWorkflowVersion || !undoRedoService.canRedo()"-->
-          <!--            nz-button>-->
-          <!--            <i-->
-          <!--              nz-icon-->
-          <!--              nzType="redo"></i>-->
-          <!--          </button>-->
+          <button
+            (click)="undoRedoService.undoAction()"
+            [disabled]="displayParticularWorkflowVersion || !undoRedoService.canUndo()"
+            nz-button>
+            <i
+              nz-icon
+              nzType="undo"></i>
+          </button>
+          <button
+            (click)="undoRedoService.redoAction()"
+            [disabled]="displayParticularWorkflowVersion || !undoRedoService.canRedo()"
+            nz-button>
+            <i
+              nz-icon
+              nzType="redo"></i>
+          </button>
         </nz-button-group>
       </ng-template>
       <nz-dropdown-menu #menu="nzDropdownMenu">
@@ -361,10 +388,10 @@
           (click)="onClickRunHandler()"
           nz-popover
           nzPopoverTitle="Execution Settings"
-          [nzPopoverTrigger]="this.config.env.userSystemEnabled?'hover':null"
+          [nzPopoverTrigger]="'hover'"
           [nzPopoverContent]="executionSettings"
           nzPopoverPlacement="bottom"
-          [disabled]="runDisable || (!workflowWebsocketService.isConnected && computingUnitStatus !== ComputingUnitState.NoComputingUnit) || displayParticularWorkflowVersion"
+          [disabled]="runDisable || (!workflowWebsocketService.isConnected && computingUnitStatus !== ComputingUnitState.NoComputingUnit) || displayParticularWorkflowVersion || selectedComputingUnit?.accessPrivilege !== Privilege.WRITE"
           id="run-button"
           nz-button
           nzType="primary">
@@ -374,10 +401,10 @@
           <span> {{ runButtonText }}</span>
         </button>
         <button
-          *ngIf="this.config.env.userSystemEnabled && this.config.env.timetravelEnabled"
+          *ngIf="this.config.env.timetravelEnabled"
           (click)="handleCheckpoint()"
           title="take checkpoint"
-          [disabled]="!this.config.env.userSystemEnabled || executionState !== ExecutionState.Paused"
+          [disabled]="executionState !== ExecutionState.Paused"
           id="checkpoint-button"
           nz-button
           nzType="primary">
diff --git a/core/gui/src/app/workspace/component/menu/menu.component.scss b/frontend/src/app/workspace/component/menu/menu.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/menu/menu.component.scss
rename to frontend/src/app/workspace/component/menu/menu.component.scss
diff --git a/core/gui/src/app/workspace/component/menu/menu.component.spec.ts b/frontend/src/app/workspace/component/menu/menu.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/menu/menu.component.spec.ts
rename to frontend/src/app/workspace/component/menu/menu.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/menu/menu.component.ts b/frontend/src/app/workspace/component/menu/menu.component.ts
similarity index 74%
rename from core/gui/src/app/workspace/component/menu/menu.component.ts
rename to frontend/src/app/workspace/component/menu/menu.component.ts
index f2dec0bfc01..9cb630e0a86 100644
--- a/core/gui/src/app/workspace/component/menu/menu.component.ts
+++ b/frontend/src/app/workspace/component/menu/menu.component.ts
@@ -18,7 +18,7 @@
  */
 
 import { DatePipe, Location } from "@angular/common";
-import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from "@angular/core";
+import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, Output, EventEmitter } from "@angular/core";
 import { UserService } from "../../../common/service/user/user.service";
 import {
   DEFAULT_WORKFLOW_NAME,
@@ -32,7 +32,7 @@ import { WorkflowActionService } from "../../service/workflow-graph/model/workfl
 import { ExecutionState } from "../../types/execute-workflow.interface";
 import { WorkflowWebsocketService } from "../../service/workflow-websocket/workflow-websocket.service";
 import { WorkflowResultExportService } from "../../service/workflow-result-export/workflow-result-export.service";
-import { catchError, debounceTime, filter, mergeMap, tap, take } from "rxjs/operators";
+import { catchError, debounceTime, filter, mergeMap, tap } from "rxjs/operators";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { WorkflowUtilService } from "../../service/workflow-graph/util/workflow-util.service";
 import { WorkflowVersionService } from "../../../dashboard/service/user/workflow-version/workflow-version.service";
@@ -42,7 +42,7 @@ import { saveAs } from "file-saver";
 import { NotificationService } from "src/app/common/service/notification/notification.service";
 import { OperatorMenuService } from "../../service/operator-menu/operator-menu.service";
 import { CoeditorPresenceService } from "../../service/workflow-graph/model/coeditor-presence.service";
-import { firstValueFrom, of, Subscription, timer, interval, Subject } from "rxjs";
+import { firstValueFrom, of, Subscription, timer } from "rxjs";
 import { isDefined } from "../../../common/util/predicate";
 import { NzModalService } from "ng-zorro-antd/modal";
 import { ResultExportationComponent } from "../result-exportation/result-exportation.component";
@@ -54,6 +54,14 @@ import { ComputingUnitStatusService } from "../../service/computing-unit-status/
 import { ComputingUnitState } from "../../types/computing-unit-connection.interface";
 import { ComputingUnitSelectionComponent } from "../power-button/computing-unit-selection.component";
 import { GuiConfigService } from "../../../common/service/gui-config.service";
+import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit";
+import { Privilege } from "../../../dashboard/type/share-access.interface";
+import { JupyterPanelService } from "../../service/jupyter-panel/jupyter-panel.service";
+import mapping from "../../../../assets/migration_tool/mapping";
+import { environment } from "../../../../environments/environment";
+import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { v4 as uuidv4 } from "uuid";
+import { NotebookMigrationLLM, Notebook } from '../../service/notebook-migration/migration-llm';
 
 /**
  * MenuComponent is the top level menu bar that shows
@@ -86,6 +94,9 @@ export class MenuComponent implements OnInit, OnDestroy {
   public isWorkflowModifiable: boolean = false;
   public workflowId?: number;
   public isExportDeactivate: boolean = false;
+  public showRegion: boolean = false;
+  public showGrid: boolean = false;
+  public showNumWorkers: boolean = false;
   protected readonly DASHBOARD_USER_WORKFLOW = DASHBOARD_USER_WORKFLOW;
 
   @Input() public writeAccess: boolean = false;
@@ -95,6 +106,8 @@ export class MenuComponent implements OnInit, OnDestroy {
   @Input() public currentExecutionName: string = ""; // reset executionName
   @Input() public particularVersionDate: string = ""; // placeholder for the metadata information of a particular workflow version
   @ViewChild("workflowNameInput") workflowNameInput: ElementRef<HTMLInputElement> | undefined;
+  // Emit an event to parent component (workspace) when AI generation starts or stops
+  @Output() public setWaitingForOpenAi = new EventEmitter<boolean>();
 
   // variable bound with HTML to decide if the running spinner should show
   public runButtonText = "Run";
@@ -110,6 +123,7 @@ export class MenuComponent implements OnInit, OnDestroy {
 
   // Computing unit status variables
   private computingUnitStatusSubscription: Subscription = new Subscription();
+  public selectedComputingUnit: DashboardWorkflowComputingUnit | null = null;
   public computingUnitStatus: ComputingUnitState = ComputingUnitState.NoComputingUnit;
 
   @ViewChild(ComputingUnitSelectionComponent) computingUnitSelectionComponent!: ComputingUnitSelectionComponent;
@@ -135,7 +149,9 @@ export class MenuComponent implements OnInit, OnDestroy {
     private reportGenerationService: ReportGenerationService,
     private panelService: PanelService,
     private computingUnitStatusService: ComputingUnitStatusService,
-    protected config: GuiConfigService
+    protected config: GuiConfigService,
+    private jupyterPanelService: JupyterPanelService,
+    private http: HttpClient
   ) {
     workflowWebsocketService
       .subscribeToEvent("ExecutionDurationUpdateEvent")
@@ -162,7 +178,8 @@ export class MenuComponent implements OnInit, OnDestroy {
     this.registerWorkflowModifiableChangedHandler();
     this.registerWorkflowIdUpdateHandler();
 
-    // Subscribe to computing unit status changes
+    // Subscribe to computing unit
+    this.subscribeToComputingUnitSelection();
     this.subscribeToComputingUnitStatus();
   }
 
@@ -202,6 +219,15 @@ export class MenuComponent implements OnInit, OnDestroy {
     this.computingUnitStatusSubscription.unsubscribe();
   }
 
+  private subscribeToComputingUnitSelection(): void {
+    this.computingUnitStatusService
+      .getSelectedComputingUnit()
+      .pipe(untilDestroyed(this))
+      .subscribe(unit => {
+        this.selectedComputingUnit = unit;
+      });
+  }
+
   /**
    * Subscribe to computing unit status changes from the ComputingUnitStatusService
    */
@@ -239,6 +265,12 @@ export class MenuComponent implements OnInit, OnDestroy {
     document.body.removeChild(tempSpan);
   }
 
+  toggleNumWorkers() {
+    this.workflowActionService
+      .getJointGraphWrapper()
+      .mainPaper.el.classList.toggle("hide-worker-count", !this.showNumWorkers);
+  }
+
   public async onClickOpenShareAccess(): Promise<void> {
     this.modalService.create({
       nzContent: ShareAccessComponent,
@@ -444,12 +476,16 @@ export class MenuComponent implements OnInit, OnDestroy {
       });
   }
 
-  /**
-   * This method will flip the current status of whether to draw grids in jointPaper.
-   * This option is only for the current session and will be cleared on refresh.
-   */
-  public onClickToggleGrids(): void {
-    this.workflowActionService.getJointGraphWrapper().toggleGrids();
+  public toggleGrid(): void {
+    this.workflowActionService.getJointGraphWrapper().mainPaper.setGridSize(this.showGrid ? 2 : 1);
+  }
+
+  public toggleRegion(): void {
+    this.workflowActionService
+      .getJointGraphWrapper()
+      .jointGraph.getElements()
+      .filter(el => el.get("type") === "region") // small improvement here too
+      .forEach(el => el.attr("body/visibility", this.showRegion ? "visible" : "hidden"));
   }
 
   /**
@@ -497,6 +533,183 @@ export class MenuComponent implements OnInit, OnDestroy {
     this.workflowActionService.deleteOperatorsAndLinks(allOperatorIDs);
   }
 
+  public onClickImportNotebook = (file: NzUploadFile): boolean => {
+    const reader = new FileReader();
+
+    // Check if the file is a Jupyter notebook based on its extension
+    const fileExtension = file.name.split(".").pop()?.toLowerCase();
+    if (fileExtension !== "ipynb") {
+      this.notificationService.error("Please upload a valid Jupyter Notebook (.ipynb) file.");
+      return false;
+    }
+
+    this.setWaitingForOpenAi.emit(true); // start loading
+
+    // Read the notebook file as text
+    reader.readAsText(file as any);
+    reader.onload = async () => {
+      try {
+        const result = reader.result;
+        if (typeof result !== "string") {
+          throw new Error("File content is not a valid string.");
+        }
+
+        // Parse the content of the .ipynb file (it's in JSON format)
+        const notebookContent = JSON.parse(result) as Notebook;
+
+        // Validate the notebook structure
+        if (!notebookContent || !Array.isArray(notebookContent.cells)) {
+          throw new Error("Invalid notebook structure.");
+        }
+
+        // Add UUID's to each cell in the notebook
+        for (const cell of notebookContent.cells) {
+          if (!cell.metadata) {
+            cell.metadata = {};
+          }
+          cell.metadata.uuid = uuidv4();
+        }
+
+        // Print content of notebook (JSON)
+        console.log(`Notebook JSON: ${JSON.stringify(notebookContent)}`);
+
+        // Send Notebook JSON to pod to open in jupyterlab
+        await this.sendNotebookToPod(notebookContent);
+
+        // Get workflow and mapping from OpenAI
+        console.log("Getting data from OpenAI...");
+        await this.sendToAIGenerateWorkflow(notebookContent)
+          .then(result => {
+            if (result) {
+              const { workflowContent, mappingContent } = result;
+              console.log("Workflow:", workflowContent);
+              console.log("Mapping:", mappingContent);
+
+              const fileExtensionIndex = file.name.lastIndexOf(".");
+              var workflowName: string;
+              if (fileExtensionIndex === -1) {
+                workflowName = file.name;
+              } else {
+                workflowName = file.name.substring(0, fileExtensionIndex);
+              }
+              if (workflowName.trim() === "") {
+                workflowName = DEFAULT_WORKFLOW_NAME;
+              }
+
+              // Create a valid Workflow object with required fields
+              const workflow: Workflow = {
+                content: workflowContent,
+                name: workflowName,
+                isPublished: 0,
+                description: undefined,
+                wid: undefined,
+                creationTime: undefined,
+                lastModifiedTime: undefined,
+                readonly: false,
+              };
+
+              this.workflowPersistService
+                .persistWorkflow(workflow)
+                .pipe(untilDestroyed(this))
+                .subscribe((updatedWorkflow: Workflow) => {
+                  const mappingID = "mapping_wid_" + updatedWorkflow.wid;
+
+                  mapping[mappingID] = {
+                    cell_to_operator: { ...mappingContent["cell_to_operator"] },
+                    operator_to_cell: { ...mappingContent["operator_to_cell"] },
+                  };
+
+                  // Store wid, mapping, and notebook in migration database
+                  const dbAPIUrl = `${environment.notebookMigrationFastAPIUrl}/postgres/store_mapping_and_workflow`;
+                  const headers = new HttpHeaders({ "Content-Type": "application/json" });
+                  const payload = {
+                    wid: updatedWorkflow.wid,
+                    mapping: mappingContent,
+                    notebook: notebookContent,
+                  };
+
+                  this.http
+                    .post(dbAPIUrl, payload, { headers })
+                    .pipe(untilDestroyed(this))
+                    .subscribe({
+                      next: (response: any) => {
+                        console.log("wid, mapping, and notebook stored in migration database:", response?.message);
+                      },
+                      error: (error: unknown) => {
+                        console.error("Network response was not ok", error);
+                      },
+                    });
+
+                  // Load workflow and open Jupyter panel
+                  this.workflowActionService.reloadWorkflow(updatedWorkflow, true);
+                  this.openJupyterNotebookPanel();
+                  this.notificationService.success("Successfully generated workflow and mapping from notebook.");
+                });
+            } else {
+              console.error("Result is undefined");
+            }
+          })
+          .catch(error => {
+            console.error("Error while fetching data from OpenAI:", error);
+          })
+          .finally(() => {
+            this.setWaitingForOpenAi.emit(false); // stop loading
+          });
+      } catch (error) {
+        this.notificationService.error("Failed to import the notebook.");
+        console.error(error);
+      }
+    };
+
+    return false; // Prevent automatic upload handling
+  };
+
+  private openJupyterNotebookPanel(): void {
+    // Assuming you have a service that handles the state of various panels
+    this.jupyterPanelService.openPanel("JupyterNotebookPanel");
+  }
+
+  private async sendToAIGenerateWorkflow(notebookContent: Notebook) {
+    const migrationLLM = new NotebookMigrationLLM();
+    migrationLLM.initialize("gpt-5-mini");
+
+    try {
+      const result = await firstValueFrom(await migrationLLM.convertNotebookToWorkflow(notebookContent));
+      const parsedResult = JSON.parse(result);
+      const workflowContent = parsedResult.workflowJSON;
+      const mappingContent = parsedResult.workflowNotebookMapping;
+      return { workflowContent, mappingContent };
+    } catch (error) {
+      console.error('Error converting notebook:', error);
+    } finally {
+      migrationLLM.close();
+    }
+  }
+
+  private async sendNotebookToPod(notebookContent: Notebook) {
+    const jupyterAPIUrl = `${environment.notebookMigrationFastAPIUrl}/jupyter/set_notebook`;
+
+    const requestBody = {
+      notebookName: "notebook.ipynb",
+      notebookData: notebookContent,
+    };
+
+    const headers = new HttpHeaders({
+      "Content-Type": "application/json",
+    });
+
+    try {
+      const response: any = await firstValueFrom(this.http.post(jupyterAPIUrl, requestBody, { headers }));
+      console.log("Notebook successfully sent to pod:", response);
+      this.notificationService.success("Notebook opened successfully in JupyterLab.");
+      this.openJupyterNotebookPanel(); // Open panel after successful upload
+    } catch (error) {
+      console.error("Error sending notebook to pod: ", error);
+      // @ts-ignore
+      this.notificationService.error("Error sending notebook to JupyterLab: " + error.message);
+    }
+  }
+
   public onClickImportWorkflow = (file: NzUploadFile): boolean => {
     const reader = new FileReader();
     reader.readAsText(file as any);
@@ -717,7 +930,9 @@ export class MenuComponent implements OnInit, OnDestroy {
     // Regular workflow execution - already connected
     this.executeWorkflowService.executeWorkflowWithEmailNotification(
       this.currentExecutionName || "Untitled Execution",
-      this.config.env.workflowEmailNotificationEnabled && this.config.env.userSystemEnabled
+      this.config.env.workflowEmailNotificationEnabled
     );
   }
+
+  protected readonly Privilege = Privilege;
 }
diff --git a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.html b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.html
rename to frontend/src/app/workspace/component/power-button/computing-unit-selection.component.html
diff --git a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.scss b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.scss
rename to frontend/src/app/workspace/component/power-button/computing-unit-selection.component.scss
diff --git a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts
similarity index 89%
rename from core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts
rename to frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts
index afee5f3ecf8..47567edb284 100644
--- a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts
+++ b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts
@@ -23,10 +23,6 @@ import { ComputingUnitSelectionComponent } from "./computing-unit-selection.comp
 import { NzButtonModule } from "ng-zorro-antd/button";
 import { CommonModule } from "@angular/common";
 import { NzIconModule } from "ng-zorro-antd/icon";
-import { WorkflowActionService } from "../../service/workflow-graph/model/workflow-action.service";
-import { ExecuteWorkflowService } from "../../service/execute-workflow/execute-workflow.service";
-import { OperatorMetadataService } from "../../service/operator-metadata/operator-metadata.service";
-import { StubOperatorMetadataService } from "../../service/operator-metadata/stub-operator-metadata.service";
 import { ActivatedRoute, ActivatedRouteSnapshot, convertToParamMap, Data, Params, UrlSegment } from "@angular/router";
 import { NzDropDownModule } from "ng-zorro-antd/dropdown";
 import { NzModalModule, NzModalService } from "ng-zorro-antd/modal";
diff --git a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts
similarity index 99%
rename from core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts
rename to frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts
index cc42b86325c..a72dbab52c5 100644
--- a/core/gui/src/app/workspace/component/power-button/computing-unit-selection.component.ts
+++ b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import { Component, OnInit, ChangeDetectorRef } from "@angular/core";
+import { ChangeDetectorRef, Component, OnInit } from "@angular/core";
 import { take } from "rxjs/operators";
 import { WorkflowComputingUnitManagingService } from "../../service/workflow-computing-unit/workflow-computing-unit-managing.service";
 import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType } from "../../types/workflow-computing-unit";
 import { NotificationService } from "../../../common/service/notification/notification.service";
-import { WorkflowWebsocketService } from "../../service/workflow-websocket/workflow-websocket.service";
 import { DEFAULT_WORKFLOW, WorkflowActionService } from "../../service/workflow-graph/model/workflow-action.service";
 import { isDefined } from "../../../common/util/predicate";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
@@ -33,7 +32,6 @@ import { WorkflowExecutionsService } from "../../../dashboard/service/user/workf
 import { WorkflowExecutionsEntry } from "../../../dashboard/type/workflow-executions-entry";
 import { ExecutionState } from "../../types/execute-workflow.interface";
 import { ShareAccessComponent } from "../../../dashboard/component/user/share-access/share-access.component";
-import { combineLatest } from "rxjs";
 import { GuiConfigService } from "../../../common/service/gui-config.service";
 
 @UntilDestroy()
diff --git a/core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.html b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.html
rename to frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.html
diff --git a/core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.scss b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.scss
rename to frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.scss
diff --git a/core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts
rename to frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.ts b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.ts
similarity index 99%
rename from core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.ts
rename to frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.ts
index 8cc463ff8ff..5d457e9050e 100644
--- a/core/gui/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.ts
+++ b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.ts
@@ -461,7 +461,6 @@ export class OperatorPropertyEditFrameComponent implements OnInit, OnChanges, On
       }
       // if presetService is ready and operator property allows presets, setup formly field to display presets
       if (
-        this.config.env.userSystemEnabled &&
         this.config.env.userPresetEnabled &&
         mapSource["enable-presets"] !== undefined &&
         this.currentOperatorId !== undefined
diff --git a/core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.html b/frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.html
rename to frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.html
diff --git a/core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.scss b/frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.scss
rename to frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.scss
diff --git a/core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.spec.ts b/frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.spec.ts
rename to frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.ts b/frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.ts
rename to frontend/src/app/workspace/component/property-editor/port-property-edit-frame/port-property-edit-frame.component.ts
diff --git a/core/gui/src/app/workspace/component/property-editor/property-editor.component.html b/frontend/src/app/workspace/component/property-editor/property-editor.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/property-editor.component.html
rename to frontend/src/app/workspace/component/property-editor/property-editor.component.html
diff --git a/core/gui/src/app/workspace/component/property-editor/property-editor.component.scss b/frontend/src/app/workspace/component/property-editor/property-editor.component.scss
similarity index 98%
rename from core/gui/src/app/workspace/component/property-editor/property-editor.component.scss
rename to frontend/src/app/workspace/component/property-editor/property-editor.component.scss
index 3a319b4c4aa..ed92f066448 100644
--- a/core/gui/src/app/workspace/component/property-editor/property-editor.component.scss
+++ b/frontend/src/app/workspace/component/property-editor/property-editor.component.scss
@@ -29,7 +29,6 @@
   position: fixed;
   top: 10vh;
   right: 0;
-  user-select: none;
   background: white;
 }
 
diff --git a/core/gui/src/app/workspace/component/property-editor/property-editor.component.spec.ts b/frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/property-editor.component.spec.ts
rename to frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/property-editor/property-editor.component.ts b/frontend/src/app/workspace/component/property-editor/property-editor.component.ts
similarity index 99%
rename from core/gui/src/app/workspace/component/property-editor/property-editor.component.ts
rename to frontend/src/app/workspace/component/property-editor/property-editor.component.ts
index 1c4c089fb90..68cf2a72004 100644
--- a/core/gui/src/app/workspace/component/property-editor/property-editor.component.ts
+++ b/frontend/src/app/workspace/component/property-editor/property-editor.component.ts
@@ -20,11 +20,11 @@
 import {
   ChangeDetectorRef,
   Component,
-  OnInit,
-  OnDestroy,
+  ElementRef,
   HostListener,
+  OnDestroy,
+  OnInit,
   Type,
-  ElementRef,
   ViewChild,
 } from "@angular/core";
 import { merge } from "rxjs";
@@ -36,6 +36,7 @@ import { PortPropertyEditFrameComponent } from "./port-property-edit-frame/port-
 import { NzResizeEvent } from "ng-zorro-antd/resizable";
 import { calculateTotalTranslate3d } from "../../../common/util/panel-dock";
 import { PanelService } from "../../service/panel/panel.service";
+
 /**
  * PropertyEditorComponent is the panel that allows user to edit operator properties.
  * Depending on the highlighted operator or link, it displays OperatorPropertyEditFrameComponent
diff --git a/core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.html b/frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.html
rename to frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.html
diff --git a/core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.spec.ts b/frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.spec.ts
similarity index 96%
rename from core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.spec.ts
rename to frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.spec.ts
index b2559c27d43..6741b98f621 100644
--- a/core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.spec.ts
+++ b/frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.spec.ts
@@ -18,7 +18,7 @@
  */
 
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
-import { HttpClientTestingModule, HttpTestingController } from "@angular/common/http/testing";
+import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { WorkflowCompilingService } from "../../../service/compile-workflow/workflow-compiling.service";
 
 import { TypeCastingDisplayComponent } from "./type-casting-display.component";
diff --git a/core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.ts b/frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.ts
rename to frontend/src/app/workspace/component/property-editor/typecasting-display/type-casting-display.component.ts
diff --git a/frontend/src/app/workspace/component/result-exportation/result-exportation.component.html b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.html
new file mode 100644
index 00000000000..1624a53a04d
--- /dev/null
+++ b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.html
@@ -0,0 +1,161 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<div class="centered-container">
+  <div
+    class="input-wrapper"
+    *ngIf="hasPartialNonDownloadable && blockingDatasetLabels.length > 0">
+    <nz-alert
+      nzType="warning"
+      nzMessage="Some operators will be skipped"
+      [nzDescription]="blockingDatasetSummary || null"></nz-alert>
+  </div>
+  <ng-container *ngIf="!isExportRestricted; else restrictedExport">
+    <div class="input-wrapper">
+      <form nz-form>
+        <nz-row *ngIf="exportType !== 'data'">
+          <nz-col [nzSpan]="24">
+            <nz-form-item>
+              <nz-form-label nzFor="exportTypeInput">Export Type</nz-form-label>
+              <nz-form-control>
+                <nz-select
+                  id="exportTypeInput"
+                  [(ngModel)]="exportType"
+                  name="exportType"
+                  nzPlaceHolder="Select export type">
+                  <nz-option
+                    *ngIf="isTableOutput"
+                    nzValue="arrow"
+                    nzLabel="Binary Format (.arrow)"></nz-option>
+                  <nz-option
+                    *ngIf="isTableOutput && !containsBinaryData"
+                    nzValue="csv"
+                    nzLabel="Comma Separated Values (.csv)"></nz-option>
+                  <nz-option
+                    *ngIf="isVisualizationOutput"
+                    nzValue="html"
+                    nzLabel="Web Page (.html)"></nz-option>
+                  <nz-option
+                    nzValue="parquet"
+                    nzLabel="Parquet (.parquet)"></nz-option>
+                </nz-select>
+              </nz-form-control>
+            </nz-form-item>
+          </nz-col>
+        </nz-row>
+        <nz-row *ngIf="exportType === 'data'">
+          <nz-col [nzSpan]="24">
+            <nz-form-item>
+              <nz-form-label nzFor="filenameInput">Filename</nz-form-label>
+              <nz-form-control>
+                <input
+                  id="filenameInput"
+                  [(ngModel)]="inputFileName"
+                  name="filename"
+                  type="text"
+                  nz-input
+                  placeholder="Enter filename for binary data" />
+              </nz-form-control>
+            </nz-form-item>
+          </nz-col>
+        </nz-row>
+        <nz-row>
+          <nz-col [nzSpan]="24">
+            <nz-form-item>
+              <nz-form-label nzFor="destinationInput">Destination</nz-form-label>
+              <nz-form-control>
+                <nz-select
+                  id="destinationInput"
+                  [(ngModel)]="destination"
+                  name="destination"
+                  nzPlaceHolder="Select destination">
+                  <nz-option
+                    nzValue="dataset"
+                    nzLabel="Dataset"></nz-option>
+                  <nz-option
+                    nzValue="local"
+                    nzLabel="Local"></nz-option>
+                </nz-select>
+              </nz-form-control>
+            </nz-form-item>
+          </nz-col>
+        </nz-row>
+      </form>
+    </div>
+    <div
+      class="input-wrapper"
+      *ngIf="destination === 'dataset'">
+      <input
+        [(ngModel)]="inputDatasetName"
+        (input)="onUserInputDatasetName($event)"
+        type="text"
+        nz-input
+        name="datasetName"
+        placeholder="Search for dataset by name..."
+        [nzAutocomplete]="auto" />
+      <nz-autocomplete #auto>
+        <nz-auto-option
+          *ngFor="let dataset of filteredUserAccessibleDatasets"
+          [nzLabel]="dataset.dataset.name">
+          <div class="auto-option-content">
+            <div class="dataset-id-container">{{dataset.dataset.did?.toString()}}</div>
+
+            <span class="dataset-name">{{ dataset.dataset.name }}</span>
+
+            <button
+              nz-button
+              nzType="primary"
+              class="dataset-option-link-btn"
+              (click)="onClickExportResult('dataset', dataset)">
+              Save
+            </button>
+          </div>
+        </nz-auto-option>
+      </nz-autocomplete>
+      <nz-divider
+        nzText="or"
+        nzOrientation="center"></nz-divider>
+      <button
+        nz-button
+        nzType="dashed"
+        nzBlock
+        (click)="onClickCreateNewDataset()">
+        <span
+          nz-icon
+          nzType="plus-circle"></span>
+        Create New Dataset
+      </button>
+    </div>
+    <button
+      nz-button
+      nzType="default"
+      *ngIf="destination === 'local'"
+      (click)="onClickExportResult( 'local')">
+      Export
+    </button>
+  </ng-container>
+  <ng-template #restrictedExport>
+    <div class="input-wrapper">
+      <nz-alert
+        nzType="error"
+        nzMessage="Export unavailable"
+        [nzDescription]="blockingDatasetSummary || null"></nz-alert>
+    </div>
+  </ng-template>
+</div>
diff --git a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.scss b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/result-exportation/result-exportation.component.scss
rename to frontend/src/app/workspace/component/result-exportation/result-exportation.component.scss
diff --git a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts
similarity index 69%
rename from core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts
rename to frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts
index c053b1545f4..2f75c8788f1 100644
--- a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts
+++ b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts
@@ -18,8 +18,11 @@
  */
 
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
-import { Component, inject, Input, OnInit } from "@angular/core";
-import { WorkflowResultExportService } from "../../service/workflow-result-export/workflow-result-export.service";
+import { Component, inject, OnInit } from "@angular/core";
+import {
+  WorkflowResultDownloadability,
+  WorkflowResultExportService,
+} from "../../service/workflow-result-export/workflow-result-export.service";
 import { DashboardDataset } from "../../../dashboard/type/dashboard-dataset.interface";
 import { DatasetService } from "../../../dashboard/service/user/dataset/dataset.service";
 import { NZ_MODAL_DATA, NzModalRef, NzModalService } from "ng-zorro-antd/modal";
@@ -52,10 +55,65 @@ export class ResultExportationComponent implements OnInit {
   containsBinaryData: boolean = false;
   inputDatasetName = "";
   selectedComputingUnit: DashboardWorkflowComputingUnit | null = null;
+  downloadability?: WorkflowResultDownloadability;
 
   userAccessibleDatasets: DashboardDataset[] = [];
   filteredUserAccessibleDatasets: DashboardDataset[] = [];
 
+  /**
+   * Gets the operator IDs to check for restrictions based on the source trigger.
+   * Menu: all operators, Context menu: highlighted operators only
+   */
+  private getOperatorIdsToCheck(): readonly string[] {
+    if (this.sourceTriggered === "menu") {
+      return this.workflowActionService
+        .getTexeraGraph()
+        .getAllOperators()
+        .map(op => op.operatorID);
+    } else {
+      return this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs();
+    }
+  }
+
+  /**
+   * Computed property: operator IDs that can be exported
+   */
+  get exportableOperatorIds(): string[] {
+    if (!this.downloadability) return [];
+    return this.downloadability.getExportableOperatorIds(this.getOperatorIdsToCheck());
+  }
+
+  /**
+   * Computed property: operator IDs that are blocked from export
+   */
+  get blockedOperatorIds(): string[] {
+    if (!this.downloadability) return [];
+    return this.downloadability.getBlockedOperatorIds(this.getOperatorIdsToCheck());
+  }
+
+  /**
+   * Computed property: whether all selected operators are blocked
+   */
+  get isExportRestricted(): boolean {
+    const operatorIds = this.getOperatorIdsToCheck();
+    return this.exportableOperatorIds.length === 0 && operatorIds.length > 0;
+  }
+
+  /**
+   * Computed property: whether some (but not all) operators are blocked
+   */
+  get hasPartialNonDownloadable(): boolean {
+    return this.exportableOperatorIds.length > 0 && this.blockedOperatorIds.length > 0;
+  }
+
+  /**
+   * Computed property: dataset labels that are blocking export
+   */
+  get blockingDatasetLabels(): string[] {
+    if (!this.downloadability) return [];
+    return this.downloadability.getBlockingDatasets(this.getOperatorIdsToCheck());
+  }
+
   constructor(
     public workflowResultExportService: WorkflowResultExportService,
     private modalRef: NzModalRef,
@@ -74,7 +132,14 @@ export class ResultExportationComponent implements OnInit {
         this.userAccessibleDatasets = datasets.filter(dataset => dataset.accessPrivilege === "WRITE");
         this.filteredUserAccessibleDatasets = [...this.userAccessibleDatasets];
       });
-    this.updateOutputType();
+
+    this.workflowResultExportService
+      .computeRestrictionAnalysis()
+      .pipe(untilDestroyed(this))
+      .subscribe(downloadability => {
+        this.downloadability = downloadability;
+        this.updateOutputType();
+      });
 
     this.computingUnitStatusService
       .getSelectedComputingUnit()
@@ -85,19 +150,12 @@ export class ResultExportationComponent implements OnInit {
   }
 
   updateOutputType(): void {
-    // Determine if the caller of this component is menu or context menu
-    // if its menu then we need to export all operators else we need to export only highlighted operators
-
-    let operatorIds: readonly string[];
-    if (this.sourceTriggered === "menu") {
-      operatorIds = this.workflowActionService
-        .getTexeraGraph()
-        .getAllOperators()
-        .map(op => op.operatorID);
-    } else {
-      operatorIds = this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs();
+    if (!this.downloadability) {
+      return;
     }
 
+    const operatorIds = this.getOperatorIdsToCheck();
+
     if (operatorIds.length === 0) {
       // No operators highlighted
       this.isTableOutput = false;
@@ -106,13 +164,19 @@ export class ResultExportationComponent implements OnInit {
       return;
     }
 
-    // Assume they're all table or visualization
-    // until we find an operator that isn't
+    if (this.isExportRestricted) {
+      this.isTableOutput = false;
+      this.isVisualizationOutput = false;
+      this.containsBinaryData = false;
+      return;
+    }
+
+    // Assume they're all table or visualization until we find an operator that isn't
     let allTable = true;
     let allVisualization = true;
     let anyBinaryData = false;
 
-    for (const operatorId of operatorIds) {
+    for (const operatorId of this.exportableOperatorIds) {
       const outputTypes = this.workflowResultService.determineOutputTypes(operatorId);
       if (!outputTypes.hasAnyResult) {
         continue;
@@ -181,4 +245,14 @@ export class ResultExportationComponent implements OnInit {
       }
     });
   }
+
+  /**
+   * Getter that returns a comma-separated string of blocking dataset labels.
+   * Used in the template to display which datasets are preventing export.
+   *
+   * @returns String like "Dataset1 (user1@example.com), Dataset2 (user2@example.com)"
+   */
+  get blockingDatasetSummary(): string {
+    return this.blockingDatasetLabels.join(", ");
+  }
 }
diff --git a/core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.html b/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.html
rename to frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.html
diff --git a/core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.scss b/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.scss
rename to frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.scss
diff --git a/core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts b/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts
rename to frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.ts b/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/console-frame/console-frame.component.ts
rename to frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.ts
diff --git a/core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.html b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.html
rename to frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.html
diff --git a/core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.scss b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.scss
rename to frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.scss
diff --git a/core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts
rename to frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.ts b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.ts
similarity index 86%
rename from core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.ts
rename to frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.ts
index 6e8994803ae..9baee35834b 100644
--- a/core/gui/src/app/workspace/component/result-panel/error-frame/error-frame.component.ts
+++ b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.ts
@@ -17,13 +17,10 @@
  * under the License.
  */
 
-import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from "@angular/core";
+import { Component, Input, OnInit } from "@angular/core";
 import { ExecuteWorkflowService } from "../../../service/execute-workflow/execute-workflow.service";
-import { WorkflowConsoleService } from "../../../service/workflow-console/workflow-console.service";
-import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
-import { WorkflowWebsocketService } from "../../../service/workflow-websocket/workflow-websocket.service";
+import { UntilDestroy } from "@ngneat/until-destroy";
 import { WorkflowFatalError } from "../../../types/workflow-websocket.interface";
-import { render } from "sass";
 import { WorkflowActionService } from "../../../service/workflow-graph/model/workflow-action.service";
 import { WorkflowCompilingService } from "../../../service/compile-workflow/workflow-compiling.service";
 
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel-modal.component.html b/frontend/src/app/workspace/component/result-panel/result-panel-modal.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/result-panel-modal.component.html
rename to frontend/src/app/workspace/component/result-panel/result-panel-modal.component.html
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel-modal.component.ts b/frontend/src/app/workspace/component/result-panel/result-panel-modal.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/result-panel-modal.component.ts
rename to frontend/src/app/workspace/component/result-panel/result-panel-modal.component.ts
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel-model.component.scss b/frontend/src/app/workspace/component/result-panel/result-panel-model.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/result-panel-model.component.scss
rename to frontend/src/app/workspace/component/result-panel/result-panel-model.component.scss
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel.component.html b/frontend/src/app/workspace/component/result-panel/result-panel.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/result-panel.component.html
rename to frontend/src/app/workspace/component/result-panel/result-panel.component.html
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel.component.scss b/frontend/src/app/workspace/component/result-panel/result-panel.component.scss
similarity index 99%
rename from core/gui/src/app/workspace/component/result-panel/result-panel.component.scss
rename to frontend/src/app/workspace/component/result-panel/result-panel.component.scss
index 767fe729750..9dbdd63dd55 100644
--- a/core/gui/src/app/workspace/component/result-panel/result-panel.component.scss
+++ b/frontend/src/app/workspace/component/result-panel/result-panel.component.scss
@@ -33,7 +33,6 @@
   position: absolute;
   top: -300px;
   left: 0;
-  user-select: none;
   background: white;
   border-radius: 5px;
   box-shadow:
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel.component.spec.ts b/frontend/src/app/workspace/component/result-panel/result-panel.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/result-panel.component.spec.ts
rename to frontend/src/app/workspace/component/result-panel/result-panel.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/result-panel/result-panel.component.ts b/frontend/src/app/workspace/component/result-panel/result-panel.component.ts
similarity index 99%
rename from core/gui/src/app/workspace/component/result-panel/result-panel.component.ts
rename to frontend/src/app/workspace/component/result-panel/result-panel.component.ts
index a0038c57342..077fac2de3a 100644
--- a/core/gui/src/app/workspace/component/result-panel/result-panel.component.ts
+++ b/frontend/src/app/workspace/component/result-panel/result-panel.component.ts
@@ -20,13 +20,12 @@
 import {
   ChangeDetectorRef,
   Component,
-  OnInit,
-  Type,
+  ElementRef,
   HostListener,
   OnDestroy,
+  OnInit,
+  Type,
   ViewChild,
-  ElementRef,
-  AfterViewInit,
 } from "@angular/core";
 import { merge } from "rxjs";
 import { ExecuteWorkflowService } from "../../service/execute-workflow/execute-workflow.service";
@@ -46,14 +45,14 @@ import { NzResizeEvent } from "ng-zorro-antd/resizable";
 import { VisualizationFrameContentComponent } from "../visualization-panel-content/visualization-frame-content.component";
 import { calculateTotalTranslate3d } from "../../../common/util/panel-dock";
 import { isDefined } from "../../../common/util/predicate";
-import { CdkDragEnd, CdkDragStart } from "@angular/cdk/drag-drop";
+import { CdkDragEnd } from "@angular/cdk/drag-drop";
 import { PanelService } from "../../service/panel/panel.service";
 import { WorkflowCompilingService } from "../../service/compile-workflow/workflow-compiling.service";
 import { CompilationState } from "../../types/workflow-compiling.interface";
 import { WorkflowFatalError } from "../../types/workflow-websocket.interface";
 
 export const DEFAULT_WIDTH = 800;
-export const DEFAULT_HEIGHT = 300;
+export const DEFAULT_HEIGHT = 500;
 /**
  * ResultPanelComponent is the bottom level area that displays the
  *  execution result of a workflow after the execution finishes.
diff --git a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.html b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.html
similarity index 86%
rename from core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.html
rename to frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.html
index 2f13bd6984d..df0b18f6353 100644
--- a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.html
+++ b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.html
@@ -25,6 +25,40 @@ <h4>Empty result set</h4>
 <div
   [hidden]="!currentColumns"
   class="result-table">
+  <div
+    class="column-search"
+    style="margin-bottom: 8px; display: flex; justify-content: flex-end">
+    <input
+      nz-input
+      placeholder="Search Columns"
+      (input)="onColumnSearch($event)"
+      style="width: 200px" />
+  </div>
+  <div
+    class="column-navigation"
+    style="margin-bottom: 8px; display: flex; justify-content: flex-end; gap: 8px"
+    [hidden]="currentColumnOffset === 0 && (!currentColumns || currentColumns.length < columnLimit)">
+    <button
+      nz-button
+      nzType="default"
+      (click)="onColumnShiftLeft()"
+      [disabled]="currentColumnOffset === 0">
+      <i
+        nz-icon
+        nzType="left"></i>
+      Previous Columns
+    </button>
+    <button
+      nz-button
+      nzType="default"
+      (click)="onColumnShiftRight()"
+      [disabled]="!currentColumns || currentColumns.length < columnLimit">
+      Next Columns
+      <i
+        nz-icon
+        nzType="right"></i>
+    </button>
+  </div>
   <div class="table-container">
     <nz-table
       #basicTable
diff --git a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.scss b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.scss
rename to frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.scss
diff --git a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.spec.ts b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.spec.ts
similarity index 87%
rename from core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.spec.ts
rename to frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.spec.ts
index 8ef0ad4d9ac..8c36110ae37 100644
--- a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.spec.ts
+++ b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.spec.ts
@@ -25,6 +25,7 @@ import { StubOperatorMetadataService } from "../../../service/operator-metadata/
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { NzModalModule } from "ng-zorro-antd/modal";
 import { commonTestProviders } from "../../../../common/testing/test-utils";
+import { GuiConfigService } from "../../../../common/service/gui-config.service";
 
 describe("ResultTableFrameComponent", () => {
   let component: ResultTableFrameComponent;
@@ -39,6 +40,14 @@ describe("ResultTableFrameComponent", () => {
           provide: OperatorMetadataService,
           useClass: StubOperatorMetadataService,
         },
+        {
+          provide: GuiConfigService,
+          useValue: {
+            env: {
+              limitColumns: 15,
+            },
+          },
+        },
         ...commonTestProviders,
       ],
     }).compileComponents();
@@ -60,4 +69,8 @@ describe("ResultTableFrameComponent", () => {
 
     expect(component.currentResult).toEqual([{ test: "property" }]);
   });
+
+  it("should set columnLimit from config", () => {
+    expect(component.columnLimit).toEqual(15);
+  });
 });
diff --git a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.ts b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.ts
similarity index 84%
rename from core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.ts
rename to frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.ts
index 7b4b134daf8..abb6daa8825 100644
--- a/core/gui/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.ts
+++ b/frontend/src/app/workspace/component/result-panel/result-table-frame/result-table-frame.component.ts
@@ -17,24 +17,21 @@
  * under the License.
  */
 
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from "@angular/core";
+import { ChangeDetectorRef, Component, Input, OnChanges, OnInit, SimpleChanges } from "@angular/core";
 import { NzModalRef, NzModalService } from "ng-zorro-antd/modal";
 import { NzTableQueryParams } from "ng-zorro-antd/table";
 import { WorkflowActionService } from "../../../service/workflow-graph/model/workflow-action.service";
 import { WorkflowResultService } from "../../../service/workflow-result/workflow-result.service";
 import { PanelResizeService } from "../../../service/workflow-result/panel-resize/panel-resize.service";
-import { isWebPaginationUpdate } from "../../../types/execute-workflow.interface";
+import { isWebPaginationUpdate, OperatorState } from "../../../types/execute-workflow.interface";
 import { IndexableObject, TableColumn } from "../../../types/result-table.interface";
 import { RowModalComponent } from "../result-panel-modal.component";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
 import { ResultExportationComponent } from "../../result-exportation/result-exportation.component";
-import { ChangeDetectorRef } from "@angular/core";
 import { SchemaAttribute } from "../../../types/workflow-compiling.interface";
-import { ExecuteWorkflowService } from "../../../service/execute-workflow/execute-workflow.service";
-import { ExecutionState } from "../../../types/execute-workflow.interface";
 import { WorkflowStatusService } from "../../../service/workflow-status/workflow-status.service";
-import { OperatorState } from "../../../types/execute-workflow.interface";
+import { GuiConfigService } from "../../../../common/service/gui-config.service";
 
 /**
  * The Component will display the result in an excel table format,
@@ -70,6 +67,9 @@ export class ResultTableFrameComponent implements OnInit, OnChanges {
   currentPageIndex: number = 1;
   totalNumTuples: number = 0;
   pageSize = 5;
+  currentColumnOffset = 0;
+  columnLimit = 25;
+  columnSearch = "";
   panelHeight = 0;
   tableStats: Record<string, Record<string, number>> = {};
   prevTableStats: Record<string, Record<string, number>> = {};
@@ -85,7 +85,8 @@ export class ResultTableFrameComponent implements OnInit, OnChanges {
     private resizeService: PanelResizeService,
     private changeDetectorRef: ChangeDetectorRef,
     private sanitizer: DomSanitizer,
-    private workflowStatusService: WorkflowStatusService
+    private workflowStatusService: WorkflowStatusService,
+    private guiConfigService: GuiConfigService
   ) {}
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -118,6 +119,8 @@ export class ResultTableFrameComponent implements OnInit, OnChanges {
         }
       });
 
+    this.columnLimit = this.guiConfigService.env.limitColumns;
+
     this.workflowResultService
       .getResultUpdateStream()
       .pipe(untilDestroyed(this))
@@ -237,8 +240,37 @@ export class ResultTableFrameComponent implements OnInit, OnChanges {
     return this.sanitizer.bypassSecurityTrustHtml(styledValue);
   }
 
+  /**
+   * Adjusts the number of result rows displayed per page based on the
+   * available vertical space of the Texera results panel.
+   *
+   * The method accounts for fixed UI elements within the panel—such as
+   * headers, column navigation controls, pagination, and the search bar—
+   * to determine the remaining space available for rendering result rows.
+   * The page size is then recalculated using the height of a single table row.
+   *
+   * To maintain a stable user experience during panel resizes, the current
+   * page index is recomputed so that the previously visible results remain
+   * in view and the user does not experience an abrupt jump in the dataset.
+   *
+   * @param panelHeight - The total height (in pixels) of the results panel.
+   */
   private adjustPageSizeBasedOnPanelSize(panelHeight: number) {
-    const newPageSize = Math.max(1, Math.floor((panelHeight - 38.62 - 64.27 - 56.6 - 32.63) / 38.62));
+    const TABLE_HEADER_HEIGHT = 38.62;
+    const PANEL_HEADER_HEIGHT = 64.27; // Includes panel title and tab bar
+    const COLUMN_NAVIGATION_HEIGHT = 56.6; // Previous/Next columns controls
+    const PAGINATION_HEIGHT = 32.63;
+    const SEARCH_BAR_HEIGHT_WITH_MARGIN = 77; // Approximate height for search bar and margins
+    const ROW_HEIGHT = 38.62;
+
+    const usedHeight =
+      TABLE_HEADER_HEIGHT +
+      PANEL_HEADER_HEIGHT +
+      COLUMN_NAVIGATION_HEIGHT +
+      PAGINATION_HEIGHT +
+      SEARCH_BAR_HEIGHT_WITH_MARGIN;
+
+    const newPageSize = Math.max(1, Math.floor((panelHeight - usedHeight) / ROW_HEIGHT));
 
     const oldOffset = (this.currentPageIndex - 1) * this.pageSize;
 
@@ -333,7 +365,7 @@ export class ResultTableFrameComponent implements OnInit, OnChanges {
     }
     this.isLoadingResult = true;
     paginatedResultService
-      .selectPage(this.currentPageIndex, this.pageSize)
+      .selectPage(this.currentPageIndex, this.pageSize, this.currentColumnOffset, this.columnLimit, this.columnSearch)
       .pipe(untilDestroyed(this))
       .subscribe(pageData => {
         if (this.currentPageIndex === pageData.pageIndex) {
@@ -409,4 +441,25 @@ export class ResultTableFrameComponent implements OnInit, OnChanges {
       nzFooter: null,
     });
   }
+
+  onColumnShiftLeft(): void {
+    if (this.currentColumnOffset > 0) {
+      this.currentColumnOffset = Math.max(0, this.currentColumnOffset - this.columnLimit);
+      this.changePaginatedResultData();
+    }
+  }
+
+  onColumnShiftRight(): void {
+    if (this.currentColumns && this.currentColumns.length === this.columnLimit) {
+      this.currentColumnOffset += this.columnLimit;
+      this.changePaginatedResultData();
+    }
+  }
+
+  onColumnSearch(event: Event): void {
+    const input = event.target as HTMLInputElement;
+    this.columnSearch = input.value;
+    this.currentColumnOffset = 0;
+    this.changePaginatedResultData();
+  }
 }
diff --git a/core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.html b/frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.html
rename to frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.html
diff --git a/core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.scss b/frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.scss
rename to frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.scss
diff --git a/core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.ts b/frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.ts
similarity index 98%
rename from core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.ts
rename to frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.ts
index 8276e414ef1..eb329c1c7f1 100644
--- a/core/gui/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.ts
+++ b/frontend/src/app/workspace/component/visualization-panel-content/visualization-frame-content.component.ts
@@ -21,7 +21,7 @@ import { AfterContentInit, Component, Input } from "@angular/core";
 import { DomSanitizer } from "@angular/platform-browser";
 import { WorkflowResultService } from "../../service/workflow-result/workflow-result.service";
 import { auditTime, filter } from "rxjs/operators";
-import { untilDestroyed, UntilDestroy } from "@ngneat/until-destroy";
+import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 
 @UntilDestroy()
 @Component({
diff --git a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.html b/frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.html
rename to frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.html
diff --git a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss b/frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss
similarity index 91%
rename from core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss
rename to frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss
index de481da276e..24799304093 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss
+++ b/frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss
@@ -24,8 +24,11 @@
   width: 100%;
 
   p {
-    word-break: break-all;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    word-break: normal;
     white-space: normal;
+    hyphens: auto;
   }
 }
 
diff --git a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.ts b/frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.ts
similarity index 98%
rename from core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.ts
rename to frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.ts
index 1f97d9565a8..7944d5d0bee 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.ts
+++ b/frontend/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.ts
@@ -24,8 +24,7 @@ import { WorkflowActionService } from "src/app/workspace/service/workflow-graph/
 import { UserService } from "src/app/common/service/user/user.service";
 import { NotificationService } from "../../../../common/service/notification/notification.service";
 import { User } from "src/app/common/type/user";
-import { untilDestroyed } from "@ngneat/until-destroy";
-import { UntilDestroy } from "@ngneat/until-destroy";
+import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { formatDate } from "@angular/common";
 import { YType } from "../../../types/shared-editing.interface";
 
diff --git a/core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.html b/frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.html
rename to frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.html
diff --git a/core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.scss b/frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.scss
similarity index 100%
rename from core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.scss
rename to frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.scss
diff --git a/core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.spec.ts b/frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.spec.ts
similarity index 99%
rename from core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.spec.ts
rename to frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.spec.ts
index f3ca76420d8..115240c4e00 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.spec.ts
+++ b/frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.spec.ts
@@ -27,7 +27,7 @@ import { WorkflowActionService } from "src/app/workspace/service/workflow-graph/
 import { WorkflowResultService } from "src/app/workspace/service/workflow-result/workflow-result.service";
 import { WorkflowResultExportService } from "src/app/workspace/service/workflow-result-export/workflow-result-export.service";
 import { OperatorMenuService } from "src/app/workspace/service/operator-menu/operator-menu.service";
-import { of, BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 import { ReactiveFormsModule } from "@angular/forms";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { NzDropDownModule } from "ng-zorro-antd/dropdown";
diff --git a/core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.ts b/frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.ts
rename to frontend/src/app/workspace/component/workflow-editor/context-menu/context-menu/context-menu.component.ts
diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html
similarity index 88%
rename from core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html
rename to frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html
index adbf9f6ab5c..bd1b5de377c 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html
+++ b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html
@@ -53,6 +53,16 @@
       nz-icon
       nzType="zoom-in"></i>
   </button>
+  <button
+    id="minimap-expand-jupyter-button"
+    (click)="onClickExpandJupyterNotebookPanel()"
+    nz-button
+    title="Expand Jupyter Notebook">
+    <i
+      nz-icon
+      nzType="expand-alt"
+      nzTheme="outline"></i>
+  </button>
   <div
     [hidden]="hidden"
     id="mini-map-container">
diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss
similarity index 93%
rename from core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss
rename to frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss
index c4d9667dc86..293dae89316 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss
+++ b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss
@@ -45,6 +45,13 @@
   z-index: 4;
 }
 
+#minimap-expand-jupyter-button {
+  position: absolute;
+  bottom: 0;
+  right: 120px;
+  z-index: 4;
+}
+
 #mini-map-container {
   position: relative;
   overflow: hidden;
diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.spec.ts b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.spec.ts
rename to frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts
similarity index 93%
rename from core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts
rename to frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts
index 3013e73c9a6..7d9c43029e7 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts
+++ b/frontend/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts
@@ -25,6 +25,7 @@ import * as joint from "jointjs";
 import { JointGraphWrapper } from "../../../service/workflow-graph/model/joint-graph-wrapper";
 import { PanelService } from "../../../service/panel/panel.service";
 import { CdkDrag } from "@angular/cdk/drag-drop";
+import { JupyterPanelService } from "../../../service/jupyter-panel/jupyter-panel.service";
 
 @UntilDestroy()
 @Component({
@@ -42,7 +43,8 @@ export class MiniMapComponent implements AfterViewInit, OnDestroy {
 
   constructor(
     private workflowActionService: WorkflowActionService,
-    private panelService: PanelService
+    private panelService: PanelService,
+    private jupyterPanelService: JupyterPanelService
   ) {}
 
   ngAfterViewInit() {
@@ -141,6 +143,13 @@ export class MiniMapComponent implements AfterViewInit, OnDestroy {
       );
   }
 
+  /**
+   * This method will expand and redisplay the jupyter notebook.
+   */
+  public onClickExpandJupyterNotebookPanel(): void {
+    this.jupyterPanelService.openJupyterNotebookPanel();
+  }
+
   public triggerCenter(): void {
     this.workflowActionService.getTexeraGraph().triggerCenterEvent();
     if (this.navigatorDrag) this.navigatorDrag.reset();
diff --git a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.html b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.html
similarity index 100%
rename from core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.html
rename to frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.html
diff --git a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.scss b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.scss
similarity index 77%
rename from core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.scss
rename to frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.scss
index 872e9fc2878..fad009b2239 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.scss
+++ b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.scss
@@ -25,15 +25,6 @@
   height: 100%;
 }
 
-::ng-deep #workflow-editor .connection-wrap {
-  stroke-width: 0;
-}
-
-::ng-deep #workflow-editor .link-tools .tool-remove path {
-  fill: #d8656a;
-  transform: translate(-12px, -12px);
-}
-
-::ng-deep #workflow-editor .link-tools .tool-remove circle {
-  fill-opacity: 0;
+::ng-deep .hide-worker-count .operator-worker-count {
+  display: none;
 }
diff --git a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts
similarity index 93%
rename from core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts
rename to frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts
index 40574b0f7ef..161d217fd86 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts
+++ b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts
@@ -897,56 +897,54 @@ describe("WorkflowEditorComponent", () => {
       expect(jointGraphWrapper.getCurrentHighlightedOperatorIDs()).toContain(mockResultPredicate.operatorID);
     });
 
-    // Temporarily disabling undo-redo because of a bug that can cause invalid workflow structures.
-    // TODO: enable after fixing the bug.
-    // //undo
-    // it("should undo action when user presses command + Z or control + Z", () => {
-    //   spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
-    //   spyOn(undoRedoService, "canUndo").and.returnValue(true);
-    //   let undoSpy = spyOn(undoRedoService, "undoAction");
-    //   fixture.detectChanges();
-    //   const commandZEvent = new KeyboardEvent("keydown", { key: "Z", metaKey: true, shiftKey: false });
-    //   (document.activeElement as HTMLElement)?.blur();
-    //   document.dispatchEvent(commandZEvent);
-    //   fixture.detectChanges();
-    //   expect(undoSpy).toHaveBeenCalledTimes(1);
-    //
-    //   const controlZEvent = new KeyboardEvent("keydown", { key: "Z", ctrlKey: true, shiftKey: false });
-    //   (document.activeElement as HTMLElement)?.blur();
-    //   document.dispatchEvent(controlZEvent);
-    //   fixture.detectChanges();
-    //   expect(undoSpy).toHaveBeenCalledTimes(2);
-    // });
-    //
-    // //redo
-    // it("should redo action when user presses command/control + Y or command/control + shift + Z", () => {
-    //   spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
-    //   spyOn(undoRedoService, "canRedo").and.returnValue(true);
-    //   let redoSpy = spyOn(undoRedoService, "redoAction");
-    //   fixture.detectChanges();
-    //   const commandYEvent = new KeyboardEvent("keydown", { key: "y", metaKey: true, shiftKey: false });
-    //   (document.activeElement as HTMLElement)?.blur();
-    //   document.dispatchEvent(commandYEvent);
-    //   fixture.detectChanges();
-    //   expect(redoSpy).toHaveBeenCalledTimes(1);
-    //
-    //   const controlYEvent = new KeyboardEvent("keydown", { key: "y", ctrlKey: true, shiftKey: false });
-    //   (document.activeElement as HTMLElement)?.blur();
-    //   document.dispatchEvent(controlYEvent);
-    //   fixture.detectChanges();
-    //   expect(redoSpy).toHaveBeenCalledTimes(2);
-    //
-    //   const commandShitZEvent = new KeyboardEvent("keydown", { key: "z", metaKey: true, shiftKey: true });
-    //   (document.activeElement as HTMLElement)?.blur();
-    //   document.dispatchEvent(commandShitZEvent);
-    //   fixture.detectChanges();
-    //   expect(redoSpy).toHaveBeenCalledTimes(3);
-    //
-    //   const controlShitZEvent = new KeyboardEvent("keydown", { key: "z", ctrlKey: true, shiftKey: true });
-    //   (document.activeElement as HTMLElement)?.blur();
-    //   document.dispatchEvent(controlShitZEvent);
-    //   fixture.detectChanges();
-    //   expect(redoSpy).toHaveBeenCalledTimes(4);
-    // });
+    //undo
+    it("should undo action when user presses command + Z or control + Z", () => {
+      spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
+      spyOn(undoRedoService, "canUndo").and.returnValue(true);
+      let undoSpy = spyOn(undoRedoService, "undoAction");
+      fixture.detectChanges();
+      const commandZEvent = new KeyboardEvent("keydown", { key: "Z", metaKey: true, shiftKey: false });
+      (document.activeElement as HTMLElement)?.blur();
+      document.dispatchEvent(commandZEvent);
+      fixture.detectChanges();
+      expect(undoSpy).toHaveBeenCalledTimes(1);
+
+      const controlZEvent = new KeyboardEvent("keydown", { key: "Z", ctrlKey: true, shiftKey: false });
+      (document.activeElement as HTMLElement)?.blur();
+      document.dispatchEvent(controlZEvent);
+      fixture.detectChanges();
+      expect(undoSpy).toHaveBeenCalledTimes(2);
+    });
+
+    //redo
+    it("should redo action when user presses command/control + Y or command/control + shift + Z", () => {
+      spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
+      spyOn(undoRedoService, "canRedo").and.returnValue(true);
+      let redoSpy = spyOn(undoRedoService, "redoAction");
+      fixture.detectChanges();
+      const commandYEvent = new KeyboardEvent("keydown", { key: "y", metaKey: true, shiftKey: false });
+      (document.activeElement as HTMLElement)?.blur();
+      document.dispatchEvent(commandYEvent);
+      fixture.detectChanges();
+      expect(redoSpy).toHaveBeenCalledTimes(1);
+
+      const controlYEvent = new KeyboardEvent("keydown", { key: "y", ctrlKey: true, shiftKey: false });
+      (document.activeElement as HTMLElement)?.blur();
+      document.dispatchEvent(controlYEvent);
+      fixture.detectChanges();
+      expect(redoSpy).toHaveBeenCalledTimes(2);
+
+      const commandShitZEvent = new KeyboardEvent("keydown", { key: "z", metaKey: true, shiftKey: true });
+      (document.activeElement as HTMLElement)?.blur();
+      document.dispatchEvent(commandShitZEvent);
+      fixture.detectChanges();
+      expect(redoSpy).toHaveBeenCalledTimes(3);
+
+      const controlShitZEvent = new KeyboardEvent("keydown", { key: "z", ctrlKey: true, shiftKey: true });
+      (document.activeElement as HTMLElement)?.blur();
+      document.dispatchEvent(controlShitZEvent);
+      fixture.detectChanges();
+      expect(redoSpy).toHaveBeenCalledTimes(4);
+    });
   });
 });
diff --git a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.ts
similarity index 93%
rename from core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts
rename to frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.ts
index 3f419d05611..a0f5671aced 100644
--- a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts
+++ b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { OnInit, AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy } from "@angular/core";
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit } from "@angular/core";
 import { fromEvent, merge, Subject } from "rxjs";
 import { NzModalCommentBoxComponent } from "./comment-box-modal/nz-modal-comment-box.component";
 import { NzModalRef, NzModalService } from "ng-zorro-antd/modal";
@@ -41,6 +41,9 @@ import * as _ from "lodash";
 import * as joint from "jointjs";
 import { isDefined } from "../../../common/util/predicate";
 import { GuiConfigService } from "../../../common/service/gui-config.service";
+import { line, curveCatmullRomClosed } from "d3-shape";
+import concaveman from "concaveman";
+import { JupyterPanelService } from "../../service/jupyter-panel/jupyter-panel.service";
 
 // jointjs interactive options for enabling and disabling interactivity
 // https://resources.jointjs.com/docs/jointjs/v3.2/joint.html#dia.Paper.prototype.options.interactive
@@ -87,7 +90,6 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
   editorWrapper!: HTMLElement;
   paper!: joint.dia.Paper;
   private interactive: boolean = true;
-  private gridOn: boolean = false;
   private _onProcessKeyboardActionObservable: Subject<void> = new Subject();
   private wrapper;
   private currentOpenedOperatorID: string | null = null;
@@ -111,7 +113,8 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
     private router: Router,
     public nzContextMenu: NzContextMenuService,
     private elementRef: ElementRef,
-    private config: GuiConfigService
+    private config: GuiConfigService,
+    private jupyterPanelService: JupyterPanelService
   ) {
     this.wrapper = this.workflowActionService.getJointGraphWrapper();
   }
@@ -162,6 +165,7 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
     this.handlePortHighlightEvent();
     this.registerPortDisplayNameChangeHandler();
     this.handleOperatorStatisticsUpdate();
+    this.handleRegionEvents();
     this.handleOperatorSuggestionHighlightEvent();
     this.handleElementDelete();
     this.handleElementSelectAll();
@@ -169,7 +173,6 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
     this.handleElementCut();
     this.handleElementPaste();
     this.handleLinkCursorHover();
-    this.handleGridsToggle();
     if (this.config.env.linkBreakpointEnabled && this.workflowActionService.getHighlightingEnabled()) {
       this.handleLinkBreakpoint();
     }
@@ -190,23 +193,21 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
       .pipe(takeUntil(this._onProcessKeyboardActionObservable))
       .subscribe(displayParticularWorkflowVersion => {
         if (!displayParticularWorkflowVersion) {
-          // Temporarily disabling undo-redo because of a bug that can cause invalid workflow structures.
-          // TODO: enable after fixing the bug.
-          // // cmd/ctrl+z undo ; ctrl+y or cmd/ctrl + shift+z for redo
-          // if ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "z") {
-          //   // UNDO
-          //   if (this.undoRedoService.canUndo()) {
-          //     this.undoRedoService.undoAction();
-          //   }
-          // } else if (
-          //   ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "y") ||
-          //   ((event.metaKey || event.ctrlKey) && event.shiftKey && event.key.toLowerCase() === "z")
-          // ) {
-          //   // redo
-          //   if (this.undoRedoService.canRedo()) {
-          //     this.undoRedoService.redoAction();
-          //   }
-          // }
+          // cmd/ctrl+z undo ; ctrl+y or cmd/ctrl + shift+z for redo
+          if ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "z") {
+            // UNDO
+            if (this.undoRedoService.canUndo()) {
+              this.undoRedoService.undoAction();
+            }
+          } else if (
+            ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "y") ||
+            ((event.metaKey || event.ctrlKey) && event.shiftKey && event.key.toLowerCase() === "z")
+          ) {
+            // redo
+            if (this.undoRedoService.canRedo()) {
+              this.undoRedoService.redoAction();
+            }
+          }
           // below for future hotkeys
         }
         this._onProcessKeyboardActionObservable.complete();
@@ -248,6 +249,7 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
       width: this.editor.offsetWidth,
       height: this.editor.offsetHeight,
     });
+    this.editor.classList.add("hide-worker-count");
   }
 
   private handleDisableJointPaperInteractiveness(): void {
@@ -333,6 +335,77 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
       });
   }
 
+  private handleRegionEvents(): void {
+    const Region = joint.dia.Element.define(
+      "region",
+      {
+        attrs: {
+          body: {
+            fill: "rgba(158,158,158,0.2)",
+            pointerEvents: "none",
+            visibility: "hidden",
+          },
+        },
+      },
+      {
+        markup: [{ tagName: "path", selector: "body" }],
+      }
+    );
+
+    let regionMap: { regionElement: joint.dia.Element; operators: joint.dia.Cell[] }[] = [];
+    // update region elements on execution
+    this.executeWorkflowService
+      .getRegionUpdateStream()
+      .pipe(untilDestroyed(this))
+      .subscribe(event => {
+        this.paper.model
+          .getCells()
+          .filter(element => element instanceof Region)
+          .forEach(element => element.remove());
+
+        regionMap = event.regions.map(([id, region]) => {
+          const element = new Region({ id: "region-" + id });
+          const ops = region.map(id => this.paper.getModelById(id));
+          this.paper.model.addCell(element);
+          this.updateRegionElement(element, ops);
+          return { regionElement: element, operators: ops };
+        });
+      });
+
+    this.paper.model.on("change:position", operator => {
+      regionMap
+        .filter(region => region.operators.includes(operator))
+        .forEach(region => this.updateRegionElement(region.regionElement, region.operators));
+    });
+
+    // update region element colors on execution
+    this.executeWorkflowService
+      .getRegionStateStream()
+      .pipe(untilDestroyed(this))
+      .subscribe(region => {
+        const colorMap: Record<string, string> = {
+          ExecutingDependeePortsPhase: "rgba(33,150,243,0.2)",
+          ExecutingNonDependeePortsPhase: "rgba(255,213,79,0.2)",
+          Completed: "rgba(76,175,80,0.2)",
+        };
+        this.paper.getModelById("region-" + region.id).attr("body/fill", colorMap[region.state]);
+      });
+  }
+
+  private updateRegionElement(regionElement: joint.dia.Element, operators: joint.dia.Cell[]) {
+    const points = operators.flatMap(op => {
+      const { x, y, width, height } = op.getBBox(),
+        padding = 15;
+      return [
+        [x - padding, y - padding],
+        [x + width + padding, y - padding],
+        [x - padding, y + height + padding + 10],
+        [x + width + padding, y + height + padding + 10],
+      ];
+    });
+    regionElement.attr("body/d", line().curve(curveCatmullRomClosed)(concaveman(points, 2, 0) as [number, number][]));
+  }
+
   /**
    * Handles restore offset default event by translating jointJS paper
    *  back to original position
@@ -504,12 +577,14 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
         const elementID = event[0].model.id.toString();
         const highlightedOperatorIDs = this.wrapper.getCurrentHighlightedOperatorIDs();
         const highlightedCommentBoxIDs = this.wrapper.getCurrentHighlightedCommentBoxIDs();
+        this.jupyterPanelService.onWorkflowComponentClick(elementID); // Highlight corresponding Jupyter notebook cell
         if (event[1].shiftKey) {
           // if in multiselect toggle highlights on click
           if (highlightedOperatorIDs.includes(elementID)) {
             this.workflowActionService.unhighlightOperators(elementID);
           } else if (this.workflowActionService.getTexeraGraph().hasOperator(elementID)) {
             this.workflowActionService.highlightOperators(<boolean>event[1].shiftKey, elementID);
+            this.jupyterPanelService.onWorkflowComponentClick(elementID); // Highlight corresponding Jupyter notebook cell
           }
           if (highlightedCommentBoxIDs.includes(elementID)) {
             this.wrapper.unhighlightCommentBoxes(elementID);
@@ -1248,25 +1323,6 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy
     return this.workflowActionService.getTexeraGraph().getOperator(operatorID).outputPorts.length == 0;
   }
 
-  /**
-   * This function handles the event stream from jointGraph to toggle the grids in jointPaper on or off.
-   * @private
-   */
-  private handleGridsToggle(): void {
-    this.wrapper
-      .getJointPaperGridsToggleStream()
-      .pipe(untilDestroyed(this))
-      .subscribe(() => {
-        if (this.gridOn) {
-          this.paper.setGridSize(1);
-          this.gridOn = false;
-        } else {
-          this.paper.setGridSize(2);
-          this.gridOn = true;
-        }
-      });
-  }
-
   /**
    * Handles mouse events to enable shared cursor.
    */
diff --git a/core/gui/src/app/workspace/component/workspace.component.html b/frontend/src/app/workspace/component/workspace.component.html
similarity index 83%
rename from core/gui/src/app/workspace/component/workspace.component.html
rename to frontend/src/app/workspace/component/workspace.component.html
index 2e662831a33..c43c64c7422 100644
--- a/core/gui/src/app/workspace/component/workspace.component.html
+++ b/frontend/src/app/workspace/component/workspace.component.html
@@ -19,7 +19,7 @@
 
 <div class="spinner-container">
   <nz-spin
-    [nzSpinning]="isLoading"
+    [nzSpinning]="isLoading || isWaitingForOpenAi"
     [nzSize]="'large'"
     nzTip="Loading workflow..."></nz-spin>
 </div>
@@ -29,9 +29,12 @@
 <texera-workflow-editor></texera-workflow-editor>
 <texera-menu
   [writeAccess]="writeAccess"
-  [pid]="pid">
+  [pid]="pid"
+  (setWaitingForOpenAi)="isWaitingForOpenAi = $event">
 </texera-menu>
+<texera-jupyter-notebook-panel></texera-jupyter-notebook-panel>
 <texera-mini-map class="box"></texera-mini-map>
 <texera-left-panel> </texera-left-panel>
+<texera-agent-panel *ngIf="copilotEnabled"></texera-agent-panel>
 <texera-property-editor></texera-property-editor>
 <ng-template #codeEditor></ng-template>
diff --git a/core/gui/src/app/workspace/component/workspace.component.scss b/frontend/src/app/workspace/component/workspace.component.scss
similarity index 90%
rename from core/gui/src/app/workspace/component/workspace.component.scss
rename to frontend/src/app/workspace/component/workspace.component.scss
index a1eae3421e0..2b01c3febde 100644
--- a/core/gui/src/app/workspace/component/workspace.component.scss
+++ b/frontend/src/app/workspace/component/workspace.component.scss
@@ -31,12 +31,20 @@ texera-menu {
   background-color: white;
 }
 
+texera-jupyter-notebook-panel {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  width: 100%;
+  background-color: white;
+}
+
 texera-mini-map {
   position: absolute;
   bottom: 0;
   right: 0;
   z-index: 3;
-  user-select: none;
 }
 
 texera-workflow-editor {
diff --git a/core/gui/src/app/workspace/component/workspace.component.spec.ts b/frontend/src/app/workspace/component/workspace.component.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/component/workspace.component.spec.ts
rename to frontend/src/app/workspace/component/workspace.component.spec.ts
diff --git a/core/gui/src/app/workspace/component/workspace.component.ts b/frontend/src/app/workspace/component/workspace.component.ts
similarity index 75%
rename from core/gui/src/app/workspace/component/workspace.component.ts
rename to frontend/src/app/workspace/component/workspace.component.ts
index bf66fe0c046..d0dc163a59c 100644
--- a/core/gui/src/app/workspace/component/workspace.component.ts
+++ b/frontend/src/app/workspace/component/workspace.component.ts
@@ -25,7 +25,6 @@ import { WorkflowPersistService } from "../../common/service/workflow-persist/wo
 import { Workflow } from "../../common/type/workflow";
 import { OperatorMetadataService } from "../service/operator-metadata/operator-metadata.service";
 import { UndoRedoService } from "../service/undo-redo/undo-redo.service";
-import { WorkflowCacheService } from "../service/workflow-cache/workflow-cache.service";
 import { WorkflowActionService } from "../service/workflow-graph/model/workflow-action.service";
 import { NzMessageService } from "ng-zorro-antd/message";
 import { debounceTime, distinctUntilChanged, filter, switchMap, throttleTime } from "rxjs/operators";
@@ -60,6 +59,8 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
   public pid?: number = undefined;
   public writeAccess: boolean = false;
   public isLoading: boolean = false;
+  // variable for track whether we are waiting for AI to finish generating (whether a loading icon should show)
+  public isWaitingForOpenAi = false;
   @ViewChild("codeEditor", { read: ViewContainerRef }) codeEditorViewRef!: ViewContainerRef;
 
   /**
@@ -78,7 +79,6 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
     private operatorReuseCacheStatusService: OperatorReuseCacheStatusService,
     // end of additional services
     private undoRedoService: UndoRedoService,
-    private workflowCacheService: WorkflowCacheService,
     private workflowPersistService: WorkflowPersistService,
     private workflowActionService: WorkflowActionService,
     private location: Location,
@@ -111,9 +111,8 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
 
   ngAfterViewInit(): void {
     /**
-     * On initialization of the workspace, there could be three cases:
+     * On initialization of the workspace, there could be two cases:
      *
-     * - with userSystem enabled, usually during prod mode:
      * 1. Accessed by URL `/`, no workflow is in the URL (Cold Start):
      -    - A new `WorkflowActionService.DEFAULT_WORKFLOW` is created, which is an empty workflow with undefined id.
      *    - After an Auto-persist being triggered by a WorkflowAction event, it will create a new workflow in the database
@@ -122,29 +121,19 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
      *    - It will retrieve the workflow from database with the given ID. Because it has an ID, it will be linked to the database
      *    - Auto-persist will be triggered upon all workspace events.
      *
-     * - with userSystem disabled, during dev mode:
-     * 1. Accessed by URL `/`, with a workflow cached (refresh manually):
-     *    - This will trigger the WorkflowCacheService to load the workflow from cache.
-     *    - Auto-cache will be triggered upon all workspace events.
-     *
-     * WorkflowActionService is the single source of the workflow representation. Both WorkflowCacheService and WorkflowPersistService are
-     * reflecting changes from WorkflowActionService.
+     * WorkflowActionService is the single source of the workflow representation. WorkflowPersistService reflects
+     * changes from WorkflowActionService.
      */
     // clear the current workspace, reset as `WorkflowActionService.DEFAULT_WORKFLOW`
     this.workflowActionService.resetAsNewWorkflow();
-
-    if (this.config.env.userSystemEnabled) {
-      // if a workflow id is present in the route, display loading spinner immediately while loading
-      const widInRoute = this.route.snapshot.params.id;
-      if (widInRoute) {
-        this.isLoading = true;
-        this.workflowActionService.disableWorkflowModification();
-      }
-
-      this.onWIDChange();
-      this.updateViewCount();
+    // if a workflow id is present in the route, display loading spinner immediately while loading
+    const widInRoute = this.route.snapshot.params.id;
+    if (widInRoute) {
+      this.isLoading = true;
+      this.workflowActionService.disableWorkflowModification();
     }
-
+    this.onWIDChange();
+    this.updateViewCount();
     this.registerLoadOperatorMetadata();
     this.codeEditorService.vc = this.codeEditorViewRef;
   }
@@ -160,16 +149,6 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
     this.workflowActionService.clearWorkflow();
   }
 
-  registerAutoCacheWorkFlow(): void {
-    this.workflowActionService
-      .workflowChanged()
-      .pipe(debounceTime(SAVE_DEBOUNCE_TIME_IN_MS))
-      .pipe(untilDestroyed(this))
-      .subscribe(() => {
-        this.workflowCacheService.setCacheWorkflow(this.workflowActionService.getWorkflow());
-      });
-  }
-
   registerAutoPersistWorkflow(): void {
     // make sure it is only registered once
     if (this.autoPersistRegistered) {
@@ -262,58 +241,25 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
       .pipe(untilDestroyed(this))
       .subscribe(() => {
         let wid = this.route.snapshot.params.id;
-        if (this.config.env.userSystemEnabled) {
-          // load workflow with wid if presented in the URL
-          if (wid) {
-            // show loading spinner right away while waiting for workflow to load
-            this.isLoading = true;
-            // temporarily disable modification to prevent editing an empty workflow before real data is loaded
-            this.workflowActionService.disableWorkflowModification();
-            // if wid is present in the url, load it from the backend once the user info is ready
-            this.userService
-              .userChanged()
-              .pipe(untilDestroyed(this))
-              .subscribe(() => {
-                this.loadWorkflowWithId(wid);
-              });
-          } else {
-            // no workflow to load; directly register auto persist for brand-new workflow
-            this.registerAutoPersistWorkflow();
-          }
+        // load workflow with wid if presented in the URL
+        if (wid) {
+          // show loading spinner right away while waiting for workflow to load
+          this.isLoading = true;
+          // temporarily disable modification to prevent editing an empty workflow before real data is loaded
+          this.workflowActionService.disableWorkflowModification();
+          // if wid is present in the url, load it from the backend once the user info is ready
+          this.userService
+            .userChanged()
+            .pipe(untilDestroyed(this))
+            .subscribe(() => {
+              this.loadWorkflowWithId(wid);
+            });
         } else {
-          // remember URL fragment
-          const fragment = this.route.snapshot.fragment;
-          // fetch the cached workflow first
-          const cachedWorkflow = this.workflowCacheService.getCachedWorkflow();
-          // responsible for saving the existing workflow in cache
-          this.registerAutoCacheWorkFlow();
-          // load the cached workflow
-          this.workflowActionService.reloadWorkflow(cachedWorkflow);
-          // set the URL fragment to previous value
-          // because reloadWorkflow will highlight/unhighlight all elements
-          // which will change the URL fragment
-          this.router.navigate([], {
-            relativeTo: this.route,
-            fragment: fragment !== null ? fragment : undefined,
-            preserveFragment: false,
-          });
-          // highlight the operator, comment box, or link in the URL fragment
-          if (fragment) {
-            if (this.workflowActionService.getTexeraGraph().hasElementWithID(fragment)) {
-              this.workflowActionService.highlightElements(false, fragment);
-            } else {
-              this.notificationService.error(`Element ${fragment} doesn't exist`);
-              // remove the fragment from the URL
-              this.router.navigate([], { relativeTo: this.route });
-            }
-          }
-          // clear stack
-          this.undoRedoService.clearUndoStack();
-          this.undoRedoService.clearRedoStack();
+          // no workflow to load; directly register auto persist for brand-new workflow
+          this.registerAutoPersistWorkflow();
         }
       });
   }
-
   onWIDChange() {
     this.workflowActionService
       .workflowMetaDataChanged()
@@ -327,7 +273,6 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
         this.writeAccess = !metadata.readonly;
       });
   }
-
   updateViewCount() {
     let wid = this.route.snapshot.params.id;
     let uid = this.userService.getCurrentUser()?.uid;
@@ -337,8 +282,11 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy {
       .pipe(untilDestroyed(this))
       .subscribe();
   }
-
   public triggerCenter(): void {
     this.workflowActionService.getTexeraGraph().triggerCenterEvent();
   }
+
+  public get copilotEnabled(): boolean {
+    return this.config.env.copilotEnabled;
+  }
 }
diff --git a/core/gui/src/app/workspace/service/ai-analyst/ai-analyst.service.ts b/frontend/src/app/workspace/service/ai-analyst/ai-analyst.service.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/ai-analyst/ai-analyst.service.ts
rename to frontend/src/app/workspace/service/ai-analyst/ai-analyst.service.ts
index 513566f5f7e..491afc6f472 100644
--- a/core/gui/src/app/workspace/service/ai-analyst/ai-analyst.service.ts
+++ b/frontend/src/app/workspace/service/ai-analyst/ai-analyst.service.ts
@@ -28,7 +28,7 @@ interface OpenAIResponse {
 
 import { Injectable } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
-import { firstValueFrom, of, catchError, Observable } from "rxjs";
+import { catchError, Observable, of } from "rxjs";
 import { map } from "rxjs/operators";
 import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
 import { AppSettings } from "../../../common/app-setting";
diff --git a/core/gui/src/app/workspace/service/ai-assistant/ai-assistant.service.ts b/frontend/src/app/workspace/service/ai-assistant/ai-assistant.service.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/ai-assistant/ai-assistant.service.ts
rename to frontend/src/app/workspace/service/ai-assistant/ai-assistant.service.ts
index 8f9fb6744ec..3b255ad11e9 100644
--- a/core/gui/src/app/workspace/service/ai-assistant/ai-assistant.service.ts
+++ b/frontend/src/app/workspace/service/ai-assistant/ai-assistant.service.ts
@@ -19,9 +19,9 @@
 
 import { Injectable } from "@angular/core";
 import { AppSettings } from "../../../common/app-setting";
-import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { HttpClient } from "@angular/common/http";
 import { Observable, of } from "rxjs";
-import { map, catchError } from "rxjs/operators";
+import { catchError, map } from "rxjs/operators";
 
 // The type annotation return from the LLM
 export type TypeAnnotationResponse = {
diff --git a/core/gui/src/app/workspace/service/code-editor/code-editor.service.ts b/frontend/src/app/workspace/service/code-editor/code-editor.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/code-editor/code-editor.service.ts
rename to frontend/src/app/workspace/service/code-editor/code-editor.service.ts
diff --git a/core/gui/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts b/frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts
similarity index 97%
rename from core/gui/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts
rename to frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts
index a82a8fdd597..9648d2b305f 100644
--- a/core/gui/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts
+++ b/frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts
@@ -40,7 +40,7 @@ import { LogicalPlan } from "../../types/execute-workflow.interface";
 import { ValidationWorkflowService } from "../validation/validation-workflow.service";
 import { WorkflowGraphReadonly } from "../workflow-graph/model/workflow-graph";
 import { serializePortIdentity } from "../../../common/util/port-identity-serde";
-import { areAllPortSchemasEqual, addCompilationError } from "../../../common/util/workflow-compilation-utils";
+import { addCompilationError, areAllPortSchemasEqual } from "../../../common/util/workflow-compilation-utils";
 import { parseLogicalOperatorPortID } from "../../../common/util/logical-operator-port-serde";
 
 // endpoint for workflow compile
@@ -148,6 +148,17 @@ export class WorkflowCompilingService {
     );
   }
 
+  public getOperatorOutputSchemaMap(operatorID: string): OperatorPortSchemaMap | undefined {
+    if (
+      this.currentCompilationStateInfo.state == CompilationState.Uninitialized ||
+      !this.currentCompilationStateInfo.operatorOutputPortSchemaMap
+    ) {
+      return undefined;
+    }
+
+    return this.currentCompilationStateInfo.operatorOutputPortSchemaMap[operatorID];
+  }
+
   public getPortInputSchema(operatorID: string, portIndex: number): PortSchema | undefined {
     return this.getOperatorInputSchemaMap(operatorID)?.[serializePortIdentity({ id: portIndex, internal: false })];
   }
diff --git a/core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts b/frontend/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts
similarity index 97%
rename from core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts
rename to frontend/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts
index 4604e52c6fd..06bd0d4071b 100644
--- a/core/gui/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts
+++ b/frontend/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts
@@ -18,8 +18,8 @@
  */
 
 import { Injectable, OnDestroy } from "@angular/core";
-import { BehaviorSubject, Observable, interval, Subscription, Subject, timer, of, merge, forkJoin } from "rxjs";
-import { filter, map, switchMap, tap, take, mergeMap, catchError, distinctUntilChanged } from "rxjs/operators";
+import { BehaviorSubject, interval, Observable, of, Subject, Subscription } from "rxjs";
+import { catchError, distinctUntilChanged, filter, map, switchMap, take, tap } from "rxjs/operators";
 import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit";
 import { WorkflowComputingUnitManagingService } from "../workflow-computing-unit/workflow-computing-unit-managing.service";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
diff --git a/core/gui/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts b/frontend/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts
rename to frontend/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts
diff --git a/frontend/src/app/workspace/service/copilot/copilot-prompts.ts b/frontend/src/app/workspace/service/copilot/copilot-prompts.ts
new file mode 100644
index 00000000000..48842211308
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/copilot-prompts.ts
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * System prompts for Texera Copilot
+ */
+
+export const COPILOT_SYSTEM_PROMPT = `# Texera Copilot
+
+You are Texera Copilot, an AI assistant for helping users do data science using Texera workflows.
+
+Your job is to leverage tools to help users understand Texera's functionalities, including what operators are available
+and how to use them.
+
+You also need to help users understand the workflow they are currently working on.
+
+During the process, leverage tool calls whenever needed. Current available tools are all READ-ONLY. Thus you cannot edit
+user's workflow.
+`;
diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.spec.ts b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.spec.ts
new file mode 100644
index 00000000000..8f3820afce4
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.spec.ts
@@ -0,0 +1,259 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { TestBed } from "@angular/core/testing";
+import { HttpClientTestingModule, HttpTestingController } from "@angular/common/http/testing";
+import { TexeraCopilotManagerService } from "./texera-copilot-manager.service";
+import { CopilotState } from "./texera-copilot";
+import { commonTestProviders } from "../../../common/testing/test-utils";
+import { AppSettings } from "../../../common/app-setting";
+
+describe("TexeraCopilotManagerService", () => {
+  let service: TexeraCopilotManagerService;
+  let httpMock: HttpTestingController;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [TexeraCopilotManagerService, ...commonTestProviders],
+    });
+
+    service = TestBed.inject(TexeraCopilotManagerService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe("fetchModelTypes", () => {
+    it("should fetch and format model types", done => {
+      const mockResponse = {
+        data: [
+          { id: "gpt-4", object: "model", created: 1234567890, owned_by: "openai" },
+          { id: "claude-3", object: "model", created: 1234567891, owned_by: "anthropic" },
+        ],
+        object: "list",
+      };
+
+      service.fetchModelTypes().subscribe(models => {
+        expect(models.length).toBe(2);
+        expect(models[0].id).toBe("gpt-4");
+        expect(models[0].name).toBe("Gpt 4");
+        expect(models[1].id).toBe("claude-3");
+        expect(models[1].name).toBe("Claude 3");
+        done();
+      });
+
+      const req = httpMock.expectOne(`${AppSettings.getApiEndpoint()}/models`);
+      expect(req.request.method).toBe("GET");
+      req.flush(mockResponse);
+    });
+
+    it("should handle fetch error gracefully", done => {
+      service.fetchModelTypes().subscribe(models => {
+        expect(models).toEqual([]);
+        done();
+      });
+
+      const req = httpMock.expectOne(`${AppSettings.getApiEndpoint()}/models`);
+      req.error(new ProgressEvent("error"));
+    });
+
+    it("should cache model types with shareReplay", done => {
+      const mockResponse = {
+        data: [{ id: "gpt-4", object: "model", created: 1234567890, owned_by: "openai" }],
+        object: "list",
+      };
+
+      service.fetchModelTypes().subscribe(() => {
+        service.fetchModelTypes().subscribe(models => {
+          expect(models.length).toBe(1);
+          done();
+        });
+      });
+
+      const req = httpMock.expectOne(`${AppSettings.getApiEndpoint()}/models`);
+      req.flush(mockResponse);
+    });
+  });
+
+  describe("getAllAgents", () => {
+    it("should return empty array initially", done => {
+      service.getAllAgents().subscribe(agents => {
+        expect(agents).toEqual([]);
+        done();
+      });
+    });
+  });
+
+  describe("getAgentCount", () => {
+    it("should return 0 initially", done => {
+      service.getAgentCount().subscribe(count => {
+        expect(count).toBe(0);
+        done();
+      });
+    });
+  });
+
+  describe("getAgent", () => {
+    it("should throw error when agent not found", done => {
+      service.getAgent("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("isAgentConnected", () => {
+    it("should return false for non-existent agent", done => {
+      service.isAgentConnected("non-existent").subscribe(connected => {
+        expect(connected).toBe(false);
+        done();
+      });
+    });
+  });
+
+  describe("agent lifecycle management", () => {
+    it("should emit agent change event on agent creation", done => {
+      let eventEmitted = false;
+
+      service.agentChange$.subscribe(() => {
+        eventEmitted = true;
+      });
+
+      setTimeout(() => {
+        expect(eventEmitted).toBe(false);
+        done();
+      }, 100);
+    });
+  });
+
+  describe("sendMessage", () => {
+    it("should throw error for non-existent agent", done => {
+      service.sendMessage("non-existent", "test message").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("getAgentResponses", () => {
+    it("should throw error for non-existent agent", done => {
+      service.getAgentResponses("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("getAgentResponsesObservable", () => {
+    it("should throw error for non-existent agent", done => {
+      service.getReActStepsObservable("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("clearMessages", () => {
+    it("should throw error for non-existent agent", done => {
+      service.clearMessages("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("stopGeneration", () => {
+    it("should throw error for non-existent agent", done => {
+      service.stopGeneration("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("getAgentState", () => {
+    it("should throw error for non-existent agent", done => {
+      service.getAgentState("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("getAgentStateObservable", () => {
+    it("should throw error for non-existent agent", done => {
+      service.getAgentStateObservable("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("getSystemInfo", () => {
+    it("should throw error for non-existent agent", done => {
+      service.getSystemInfo("non-existent").subscribe({
+        next: () => fail("Should have thrown error"),
+        error: (error: unknown) => {
+          expect((error as Error).message).toContain("not found");
+          done();
+        },
+      });
+    });
+  });
+
+  describe("deleteAgent", () => {
+    it("should return false for non-existent agent", done => {
+      service.deleteAgent("non-existent").subscribe(deleted => {
+        expect(deleted).toBe(false);
+        done();
+      });
+    });
+  });
+});
diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.ts b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.ts
new file mode 100644
index 00000000000..ab7d393265f
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.ts
@@ -0,0 +1,248 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Injectable, Injector } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import { TexeraCopilot, ReActStep, CopilotState } from "./texera-copilot";
+import { Observable, Subject, catchError, map, of, shareReplay, tap, defer, throwError, switchMap } from "rxjs";
+import { AppSettings } from "../../../common/app-setting";
+
+export interface AgentInfo {
+  id: string;
+  name: string;
+  modelType: string;
+  instance: TexeraCopilot;
+  createdAt: Date;
+}
+
+export interface ModelType {
+  id: string;
+  name: string;
+  description: string;
+  icon: string;
+}
+
+interface LiteLLMModel {
+  id: string;
+  object: string;
+  created: number;
+  owned_by: string;
+}
+
+interface LiteLLMModelsResponse {
+  data: LiteLLMModel[];
+  object: string;
+}
+
+/**
+ * Texera Copilot Manager Service manages multiple AI agent instances for workflow assistance.
+ *
+ * This service provides centralized management for multiple copilot agents, allowing users to:
+ * 1. Create and delete multiple agent instances with different LLM models
+ * 2. Route messages to specific agents
+ * 3. Track agent states and conversation history
+ * 4. Query available LLM models from the backend
+ *
+ * Each agent is a separate TexeraCopilot instance with its own:
+ * - Model configuration (e.g., GPT-4, Claude, etc.)
+ * - Conversation history
+ * - State (available, generating, stopping, unavailable)
+ *
+ * The service acts as a registry and coordinator, ensuring proper lifecycle management
+ * and providing observable streams for agent changes and state updates.
+ */
+@Injectable({
+  providedIn: "root",
+})
+export class TexeraCopilotManagerService {
+  private agents = new Map<string, AgentInfo>();
+  private agentCounter = 0;
+  private agentChangeSubject = new Subject<void>();
+  public agentChange$ = this.agentChangeSubject.asObservable();
+
+  private modelTypes$: Observable<ModelType[]> | null = null;
+
+  constructor(
+    private injector: Injector,
+    private http: HttpClient
+  ) {}
+
+  public createAgent(modelType: string, customName?: string): Observable<AgentInfo> {
+    return defer(() => {
+      const agentId = `agent-${++this.agentCounter}`;
+      const agentName = customName || `Agent ${this.agentCounter}`;
+
+      const agentInstance = this.createCopilotInstance(modelType);
+      agentInstance.setAgentInfo(agentName);
+
+      return agentInstance.initialize().pipe(
+        map(() => {
+          const agentInfo: AgentInfo = {
+            id: agentId,
+            name: agentName,
+            modelType,
+            instance: agentInstance,
+            createdAt: new Date(),
+          };
+
+          this.agents.set(agentId, agentInfo);
+          this.agentChangeSubject.next();
+
+          return agentInfo;
+        }),
+        catchError((error: unknown) => {
+          return throwError(() => error);
+        })
+      );
+    });
+  }
+
+  /**
+   * Helper method to get an agent and execute a callback with it.
+   * Handles agent lookup and error throwing if not found.
+   */
+  private withAgent<T>(agentId: string, callback: (agent: AgentInfo) => Observable<T>): Observable<T> {
+    return defer(() => {
+      const agent = this.agents.get(agentId);
+      if (!agent) {
+        return throwError(() => new Error(`Agent with ID ${agentId} not found`));
+      }
+      return callback(agent);
+    });
+  }
+
+  public getAgent(agentId: string): Observable<AgentInfo> {
+    return this.withAgent(agentId, agent => of(agent));
+  }
+
+  public getAllAgents(): Observable<AgentInfo[]> {
+    return of(Array.from(this.agents.values()));
+  }
+  public deleteAgent(agentId: string): Observable<boolean> {
+    return defer(() => {
+      const agent = this.agents.get(agentId);
+      if (!agent) {
+        return of(false);
+      }
+
+      return agent.instance.disconnect().pipe(
+        map(() => {
+          this.agents.delete(agentId);
+          this.agentChangeSubject.next();
+          return true;
+        })
+      );
+    });
+  }
+
+  public fetchModelTypes(): Observable<ModelType[]> {
+    if (!this.modelTypes$) {
+      this.modelTypes$ = this.http.get<LiteLLMModelsResponse>(`${AppSettings.getApiEndpoint()}/models`).pipe(
+        map(response =>
+          response.data.map((model: LiteLLMModel) => ({
+            id: model.id,
+            name: this.formatModelName(model.id),
+            description: `Model: ${model.id}`,
+            icon: "robot",
+          }))
+        ),
+        catchError((error: unknown) => {
+          console.error("Failed to fetch models from API:", error);
+          return of([]);
+        }),
+        shareReplay(1)
+      );
+    }
+    return this.modelTypes$;
+  }
+
+  private formatModelName(modelId: string): string {
+    return modelId
+      .split("-")
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+      .join(" ");
+  }
+
+  public getAgentCount(): Observable<number> {
+    return of(this.agents.size);
+  }
+  public sendMessage(agentId: string, message: string): Observable<void> {
+    return this.withAgent(agentId, agent => agent.instance.sendMessage(message));
+  }
+
+  public getReActStepsObservable(agentId: string): Observable<ReActStep[]> {
+    return this.withAgent(agentId, agent => agent.instance.reActSteps$);
+  }
+
+  public getAgentResponses(agentId: string): Observable<ReActStep[]> {
+    return this.withAgent(agentId, agent => of(agent.instance.getReActSteps()));
+  }
+
+  public clearMessages(agentId: string): Observable<void> {
+    return this.withAgent(agentId, agent => {
+      agent.instance.clearMessages();
+      return of(undefined);
+    });
+  }
+
+  public stopGeneration(agentId: string): Observable<void> {
+    return this.withAgent(agentId, agent => {
+      agent.instance.stopGeneration();
+      return of(undefined);
+    });
+  }
+
+  public getAgentState(agentId: string): Observable<CopilotState> {
+    return this.withAgent(agentId, agent => of(agent.instance.getState()));
+  }
+
+  public getAgentStateObservable(agentId: string): Observable<CopilotState> {
+    return this.withAgent(agentId, agent => agent.instance.state$);
+  }
+
+  public isAgentConnected(agentId: string): Observable<boolean> {
+    return this.withAgent(agentId, agent => of(agent.instance.isConnected())).pipe(catchError(() => of(false)));
+  }
+
+  public getSystemInfo(
+    agentId: string
+  ): Observable<{ systemPrompt: string; tools: Array<{ name: string; description: string; inputSchema: any }> }> {
+    return this.withAgent(agentId, agent =>
+      of({
+        systemPrompt: agent.instance.getSystemPrompt(),
+        tools: agent.instance.getToolsInfo(),
+      })
+    );
+  }
+  private createCopilotInstance(modelType: string): TexeraCopilot {
+    const childInjector = Injector.create({
+      providers: [
+        {
+          provide: TexeraCopilot,
+        },
+      ],
+      parent: this.injector,
+    });
+
+    const copilotInstance = childInjector.get(TexeraCopilot);
+    copilotInstance.setModelType(modelType);
+
+    return copilotInstance;
+  }
+}
diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot.spec.ts b/frontend/src/app/workspace/service/copilot/texera-copilot.spec.ts
new file mode 100644
index 00000000000..dd5a7e5bb6a
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/texera-copilot.spec.ts
@@ -0,0 +1,189 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { TestBed } from "@angular/core/testing";
+import { TexeraCopilot, CopilotState } from "./texera-copilot";
+import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
+import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.service";
+import { OperatorMetadataService } from "../operator-metadata/operator-metadata.service";
+import { WorkflowCompilingService } from "../compile-workflow/workflow-compiling.service";
+import { NotificationService } from "../../../common/service/notification/notification.service";
+import { commonTestProviders } from "../../../common/testing/test-utils";
+
+describe("TexeraCopilot", () => {
+  let service: TexeraCopilot;
+  let mockWorkflowActionService: jasmine.SpyObj<WorkflowActionService>;
+  let mockWorkflowUtilService: jasmine.SpyObj<WorkflowUtilService>;
+  let mockOperatorMetadataService: jasmine.SpyObj<OperatorMetadataService>;
+  let mockWorkflowCompilingService: jasmine.SpyObj<WorkflowCompilingService>;
+  let mockNotificationService: jasmine.SpyObj<NotificationService>;
+
+  beforeEach(() => {
+    mockWorkflowActionService = jasmine.createSpyObj("WorkflowActionService", ["getTexeraGraph"]);
+    mockWorkflowUtilService = jasmine.createSpyObj("WorkflowUtilService", ["getOperatorTypeList"]);
+    mockOperatorMetadataService = jasmine.createSpyObj("OperatorMetadataService", ["getOperatorSchema"]);
+    mockWorkflowCompilingService = jasmine.createSpyObj("WorkflowCompilingService", [
+      "getOperatorInputSchemaMap",
+      "getOperatorOutputSchemaMap",
+    ]);
+    mockNotificationService = jasmine.createSpyObj("NotificationService", ["info", "error"]);
+
+    TestBed.configureTestingModule({
+      providers: [
+        TexeraCopilot,
+        { provide: WorkflowActionService, useValue: mockWorkflowActionService },
+        { provide: WorkflowUtilService, useValue: mockWorkflowUtilService },
+        { provide: OperatorMetadataService, useValue: mockOperatorMetadataService },
+        { provide: WorkflowCompilingService, useValue: mockWorkflowCompilingService },
+        { provide: NotificationService, useValue: mockNotificationService },
+        ...commonTestProviders,
+      ],
+    });
+
+    service = TestBed.inject(TexeraCopilot);
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  it("should set agent info correctly", () => {
+    service.setAgentInfo("Test Agent");
+    expect(service).toBeTruthy();
+  });
+
+  it("should set model type correctly", () => {
+    service.setModelType("gpt-4");
+    expect(service).toBeTruthy();
+  });
+
+  it("should have initial state as UNAVAILABLE", () => {
+    expect(service.getState()).toBe(CopilotState.UNAVAILABLE);
+  });
+
+  it("should update state correctly", done => {
+    service.state$.subscribe(state => {
+      if (state === CopilotState.UNAVAILABLE) {
+        expect(state).toBe(CopilotState.UNAVAILABLE);
+        done();
+      }
+    });
+  });
+
+  it("should clear messages correctly", () => {
+    service.clearMessages();
+    expect(service.getReActSteps().length).toBe(0);
+  });
+
+  it("should stop generation when in GENERATING state", () => {
+    service.stopGeneration();
+    expect(service).toBeTruthy();
+  });
+
+  it("should return system prompt", () => {
+    const prompt = service.getSystemPrompt();
+    expect(prompt).toBeTruthy();
+    expect(typeof prompt).toBe("string");
+  });
+
+  it("should return tools info", done => {
+    // Tools are only created after initialize() is called
+    service.initialize().subscribe(() => {
+      const tools = service.getToolsInfo();
+      expect(tools).toBeTruthy();
+      expect(Array.isArray(tools)).toBe(true);
+      expect(tools.length).toBeGreaterThan(0);
+      tools.forEach(tool => {
+        expect(tool.name).toBeTruthy();
+        expect(tool.description).toBeTruthy();
+      });
+      done();
+    });
+  });
+
+  it("should check if connected", () => {
+    expect(service.isConnected()).toBe(false);
+  });
+
+  it("should emit agent responses correctly", done => {
+    service.reActSteps$.subscribe(responses => {
+      if (responses.length > 0) {
+        expect(responses[0].role).toBe("user");
+        expect(responses[0].content).toBe("test message");
+        done();
+      }
+    });
+
+    // emitReActStep signature: (messageId, stepId, role, content, isBegin, isEnd, toolCalls?, toolResults?, usage?, operatorAccess?)
+    (service as any).emitReActStep("test-id", 0, "user", "test message", true, true);
+  });
+
+  it("should return empty agent responses initially", () => {
+    const responses = service.getReActSteps();
+    expect(responses).toEqual([]);
+  });
+
+  describe("disconnect", () => {
+    it("should disconnect and clear state", done => {
+      service.disconnect().subscribe(() => {
+        expect(service.getState()).toBe(CopilotState.UNAVAILABLE);
+        expect(service.getReActSteps().length).toBe(0);
+        done();
+      });
+    });
+
+    it("should show notification on disconnect", done => {
+      service.setAgentInfo("Test Agent");
+      service.disconnect().subscribe(() => {
+        expect(mockNotificationService.info).toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+
+  describe("state management", () => {
+    it("should transition from UNAVAILABLE to GENERATING to AVAILABLE", done => {
+      const states: CopilotState[] = [];
+
+      service.state$.subscribe(state => {
+        states.push(state);
+        if (states.length === 1) {
+          expect(states[0]).toBe(CopilotState.UNAVAILABLE);
+          done();
+        }
+      });
+    });
+  });
+
+  describe("workflow tools", () => {
+    it("should create workflow tools correctly", () => {
+      const tools = (service as any).createWorkflowTools();
+      expect(tools).toBeTruthy();
+      expect(typeof tools).toBe("object");
+      // Tool names match the constants in the tool files
+      expect(tools.listAllOperatorTypes).toBeTruthy();
+      expect(tools.listOperatorsInCurrentWorkflow).toBeTruthy();
+      expect(tools.listCurrentLinks).toBeTruthy();
+      expect(tools.getCurrentOperator).toBeTruthy();
+      expect(tools.getOperatorPropertiesSchema).toBeTruthy();
+      expect(tools.getOperatorPortsInfo).toBeTruthy();
+      expect(tools.getOperatorMetadata).toBeTruthy();
+    });
+  });
+});
diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot.ts b/frontend/src/app/workspace/service/copilot/texera-copilot.ts
new file mode 100644
index 00000000000..cb7cc91e111
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/texera-copilot.ts
@@ -0,0 +1,388 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Injectable } from "@angular/core";
+import { BehaviorSubject, Observable, from, of, throwError, defer } from "rxjs";
+import { map, catchError, tap, switchMap, finalize } from "rxjs/operators";
+import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
+import { toolWithTimeout } from "./tool/tools-utility";
+import * as CurrentWorkflowTools from "./tool/current-workflow-editing-observing-tools";
+import * as MetadataTools from "./tool/workflow-metadata-tools";
+import { ToolOperatorAccess, parseOperatorAccessFromStep } from "./tool/react-step-operator-parser";
+import { OperatorMetadataService } from "../operator-metadata/operator-metadata.service";
+import { createOpenAI } from "@ai-sdk/openai";
+import { generateText, type ModelMessage, stepCountIs } from "ai";
+import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.service";
+import { AppSettings } from "../../../common/app-setting";
+import { WorkflowCompilingService } from "../compile-workflow/workflow-compiling.service";
+import { COPILOT_SYSTEM_PROMPT } from "./copilot-prompts";
+import { NotificationService } from "../../../common/service/notification/notification.service";
+
+export enum CopilotState {
+  UNAVAILABLE = "Unavailable",
+  AVAILABLE = "Available",
+  GENERATING = "Generating",
+  STOPPING = "Stopping",
+}
+
+/**
+ * Represents a single step in the ReAct (Reasoning and Acting) conversation flow.
+ * Each step can be either a user message or an agent response with potential tool calls.
+ */
+export interface ReActStep {
+  messageId: string;
+  stepId: number;
+  role: "user" | "agent";
+  content: string;
+  isBegin: boolean;
+  isEnd: boolean;
+  timestamp: number;
+  toolCalls?: any[];
+  toolResults?: any[];
+  usage?: {
+    inputTokens?: number;
+    outputTokens?: number;
+    totalTokens?: number;
+    cachedInputTokens?: number;
+  };
+  /**
+   * Map from tool call index to operator access information, which tracks operators were viewed or modified during the tool call.
+   */
+  operatorAccess?: Map<number, ToolOperatorAccess>;
+}
+
+/**
+ * Texera Copilot Service provides AI-powered assistance for workflow creation and manipulation.
+ *
+ * This service manages a single AI agent instance that can:
+ * 1. Interact with users through natural language messages
+ * 2. Execute workflow operations using specialized tools
+ * 3. Maintain conversation history and state
+ *
+ * The service communicates with an LLM backend (via LiteLLM) to generate responses and uses
+ * workflow tools to perform actions like listing operators, getting operator schemas, and
+ * manipulating workflow components.
+ *
+ * State management includes:
+ * - UNAVAILABLE: Agent not initialized
+ * - AVAILABLE: Agent ready to receive messages
+ * - GENERATING: Agent currently processing and generating response
+ * - STOPPING: Agent in the process of stopping generation
+ */
+@Injectable()
+export class TexeraCopilot {
+  /**
+   * Maximum number of ReAct reasoning/action cycles allowed per generation.
+   * Prevents infinite loops and excessive token usage.
+   */
+  private static readonly MAX_REACT_STEPS = 50;
+
+  private model: any;
+  private modelType = "";
+  private agentName = "";
+
+  /**
+   * Conversation history in LLM API format.
+   * Used internally to maintain context for generateText() API calls.
+   * Contains the raw message format expected by the AI model.
+   */
+  private messages: ModelMessage[] = [];
+
+  /**
+   * Representing a step in ReAct (Reasoning + Acting).
+   * This is what gets displayed in the UI to show the agent's reasoning process.
+   * Each step contains messageId (randomly generated UUID) and stepId (incremental from 0).
+   */
+  private reActSteps: ReActStep[] = [];
+  private reActStepsSubject = new BehaviorSubject<ReActStep[]>([]);
+  public reActSteps$ = this.reActStepsSubject.asObservable();
+
+  private state = CopilotState.UNAVAILABLE;
+  private stateSubject = new BehaviorSubject<CopilotState>(CopilotState.UNAVAILABLE);
+  public state$ = this.stateSubject.asObservable();
+  private tools: Record<string, any> = {};
+
+  constructor(
+    private workflowActionService: WorkflowActionService,
+    private workflowUtilService: WorkflowUtilService,
+    private operatorMetadataService: OperatorMetadataService,
+    private workflowCompilingService: WorkflowCompilingService,
+    private notificationService: NotificationService
+  ) {}
+
+  public setAgentInfo(agentName: string): void {
+    this.agentName = agentName;
+  }
+
+  public setModelType(modelType: string): void {
+    this.modelType = modelType;
+  }
+
+  private setState(newState: CopilotState): void {
+    this.state = newState;
+    this.stateSubject.next(newState);
+  }
+
+  private emitReActStep(
+    messageId: string,
+    stepId: number,
+    role: "user" | "agent",
+    content: string,
+    isBegin: boolean,
+    isEnd: boolean,
+    toolCalls?: any[],
+    toolResults?: any[],
+    usage?: ReActStep["usage"],
+    operatorAccess?: Map<number, ToolOperatorAccess>
+  ): void {
+    this.reActSteps.push({
+      messageId,
+      stepId,
+      role,
+      content,
+      isBegin,
+      isEnd,
+      timestamp: Date.now(),
+      toolCalls,
+      toolResults,
+      usage,
+      operatorAccess,
+    });
+    this.reActStepsSubject.next([...this.reActSteps]);
+  }
+
+  public initialize(): Observable<void> {
+    return defer(() => {
+      try {
+        this.model = createOpenAI({
+          baseURL: new URL(`${AppSettings.getApiEndpoint()}`, document.baseURI).toString(),
+          // apiKey is required by the library for creating the OpenAI compatible client;
+          // For security reason, we store the apiKey at the backend, thus the value is dummy here.
+          apiKey: "dummy",
+        }).chat(this.modelType);
+
+        // Create tools once during initialization
+        this.tools = this.createWorkflowTools();
+
+        this.setState(CopilotState.AVAILABLE);
+        return of(undefined);
+      } catch (error: unknown) {
+        this.setState(CopilotState.UNAVAILABLE);
+        return throwError(() => error);
+      }
+    });
+  }
+
+  public sendMessage(message: string): Observable<void> {
+    return defer(() => {
+      if (!this.model) {
+        return throwError(() => new Error("Copilot not initialized"));
+      }
+
+      if (this.state !== CopilotState.AVAILABLE) {
+        return throwError(() => new Error(`Cannot send message: agent is ${this.state}`));
+      }
+
+      this.setState(CopilotState.GENERATING);
+
+      // Generate unique message ID for this conversation turn
+      const messageId = crypto.randomUUID();
+      let stepId = 0;
+
+      // Emit user message as first step
+      this.emitReActStep(messageId, stepId++, "user", message, true, true);
+      this.messages.push({ role: "user", content: message });
+
+      let isFirstStep = true;
+
+      /**
+       * Generate text using the AI model with ReAct (Reasoning + Acting) pattern.
+       * This is the core of the agent lifecycle with several callbacks:
+       *
+       * Lifecycle flow:
+       * 1. generateText() starts the LLM generation
+       * 2. stopWhen() - checked before each step to determine if generation should stop
+       * 3. onStepFinish() - called DURING generation after each reasoning/action step (real-time updates)
+       * 4. pipe operators - executed AFTER generation completes (final processing)
+       */
+      return from(
+        generateText({
+          model: this.model,
+          messages: this.messages,
+          tools: this.tools,
+          system: COPILOT_SYSTEM_PROMPT,
+          /**
+           * stopWhen - Determines if generation should stop.
+           * Called before each step during generation.
+           * Returns true to stop, false to continue.
+           */
+          stopWhen: ({ steps }) => {
+            if (this.state === CopilotState.STOPPING) {
+              this.notificationService.info(`Agent ${this.agentName} has stopped generation`);
+              return true;
+            }
+            // Stop if step count reaches max limit to prevent infinite loops
+            return stepCountIs(TexeraCopilot.MAX_REACT_STEPS)({ steps });
+          },
+          /**
+           * onStepFinish is called DURING generation after each ReAct step completes.
+           * This provides real-time updates to the UI as the agent reasons and acts.
+           *
+           * Each step may include:
+           * - text: The agent's reasoning or response text
+           * - toolCalls: Tools the agent decided to call
+           * - toolResults: Results from executed tools
+           * - usage: Token usage for this step
+           *
+           * Note: This is called multiple times during a single generation,
+           * once per reasoning/action cycle.
+           */
+          onStepFinish: ({ text, toolCalls, toolResults, usage }) => {
+            if (this.state === CopilotState.STOPPING) {
+              return;
+            }
+
+            // Parse operator access from tool results to track viewed/modified operators
+            const operatorAccess = parseOperatorAccessFromStep(toolCalls || [], toolResults || []);
+
+            this.emitReActStep(
+              messageId,
+              stepId++,
+              "agent",
+              text || "",
+              isFirstStep,
+              false,
+              toolCalls,
+              toolResults,
+              usage as any,
+              operatorAccess
+            );
+            isFirstStep = false;
+          },
+        })
+      ).pipe(
+        /**
+         * To this point, generateText has finished.
+         * All the responses from AI are recorded in responses variable.
+         */
+        tap(({ response }) => {
+          this.messages.push(...response.messages);
+          this.reActStepsSubject.next([...this.reActSteps]);
+        }),
+        map(() => undefined),
+        catchError((err: unknown) => {
+          const errorText = `Error: ${err instanceof Error ? err.message : String(err)}`;
+          this.messages.push({ role: "assistant", content: errorText });
+          this.emitReActStep(messageId, stepId++, "agent", errorText, false, true);
+          return throwError(() => err);
+        }),
+        /**
+         * Resets agent state back to AVAILABLE so it can handle new messages.
+         */
+        finalize(() => {
+          this.setState(CopilotState.AVAILABLE);
+        })
+      );
+    });
+  }
+
+  private createWorkflowTools(): Record<string, any> {
+    const listOperatorsInCurrentWorkflowTool = toolWithTimeout(
+      CurrentWorkflowTools.createListOperatorsInCurrentWorkflowTool(this.workflowActionService)
+    );
+    const listLinksTool = toolWithTimeout(CurrentWorkflowTools.createListCurrentLinksTool(this.workflowActionService));
+    const listAllOperatorTypesTool = toolWithTimeout(
+      MetadataTools.createListAllOperatorTypesTool(this.workflowUtilService)
+    );
+    const getOperatorTool = toolWithTimeout(
+      CurrentWorkflowTools.createGetCurrentOperatorTool(this.workflowActionService, this.workflowCompilingService)
+    );
+    const getOperatorPropertiesSchemaTool = toolWithTimeout(
+      MetadataTools.createGetOperatorPropertiesSchemaTool(this.operatorMetadataService)
+    );
+    const getOperatorPortsInfoTool = toolWithTimeout(
+      MetadataTools.createGetOperatorPortsInfoTool(this.operatorMetadataService)
+    );
+    const getOperatorMetadataTool = toolWithTimeout(
+      MetadataTools.createGetOperatorMetadataTool(this.operatorMetadataService)
+    );
+
+    return {
+      [MetadataTools.TOOL_NAME_LIST_ALL_OPERATOR_TYPES]: listAllOperatorTypesTool,
+      [CurrentWorkflowTools.TOOL_NAME_LIST_OPERATORS_IN_CURRENT_WORKFLOW]: listOperatorsInCurrentWorkflowTool,
+      [CurrentWorkflowTools.TOOL_NAME_LIST_CURRENT_LINKS]: listLinksTool,
+      [CurrentWorkflowTools.TOOL_NAME_GET_CURRENT_OPERATOR]: getOperatorTool,
+      [MetadataTools.TOOL_NAME_GET_OPERATOR_PROPERTIES_SCHEMA]: getOperatorPropertiesSchemaTool,
+      [MetadataTools.TOOL_NAME_GET_OPERATOR_PORTS_INFO]: getOperatorPortsInfoTool,
+      [MetadataTools.TOOL_NAME_GET_OPERATOR_METADATA]: getOperatorMetadataTool,
+    };
+  }
+
+  public getReActSteps(): ReActStep[] {
+    return [...this.reActSteps];
+  }
+
+  public stopGeneration(): void {
+    if (this.state !== CopilotState.GENERATING) {
+      return;
+    }
+    this.setState(CopilotState.STOPPING);
+  }
+
+  public clearMessages(): void {
+    this.messages = [];
+    this.reActSteps = [];
+    this.reActStepsSubject.next([]);
+  }
+
+  public getState(): CopilotState {
+    return this.state;
+  }
+
+  public disconnect(): Observable<void> {
+    return defer(() => {
+      if (this.state === CopilotState.GENERATING) {
+        this.stopGeneration();
+      }
+
+      this.clearMessages();
+      this.tools = {}; // Clear tools to free memory
+      this.setState(CopilotState.UNAVAILABLE);
+      this.notificationService.info(`Agent ${this.agentName} is removed successfully`);
+
+      return of(undefined);
+    });
+  }
+
+  public isConnected(): boolean {
+    return this.state !== CopilotState.UNAVAILABLE;
+  }
+
+  public getSystemPrompt(): string {
+    return COPILOT_SYSTEM_PROMPT;
+  }
+
+  public getToolsInfo(): Array<{ name: string; description: string; inputSchema: any }> {
+    return Object.entries(this.tools).map(([name, tool]) => ({
+      name: name,
+      description: tool.description || "No description available",
+      inputSchema: tool.parameters || {},
+    }));
+  }
+}
diff --git a/frontend/src/app/workspace/service/copilot/tool/current-workflow-editing-observing-tools.ts b/frontend/src/app/workspace/service/copilot/tool/current-workflow-editing-observing-tools.ts
new file mode 100644
index 00000000000..c67a7b1707c
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/tool/current-workflow-editing-observing-tools.ts
@@ -0,0 +1,127 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { z } from "zod";
+import { tool } from "ai";
+import { WorkflowActionService } from "../../workflow-graph/model/workflow-action.service";
+import { OperatorMetadataService } from "../../operator-metadata/operator-metadata.service";
+import { OperatorLink } from "../../../types/workflow-common.interface";
+import { WorkflowUtilService } from "../../workflow-graph/util/workflow-util.service";
+import { WorkflowCompilingService } from "../../compile-workflow/workflow-compiling.service";
+import { ValidationWorkflowService } from "../../validation/validation-workflow.service";
+import { createSuccessResult, createErrorResult } from "./tools-utility";
+
+// Tool name constants
+export const TOOL_NAME_LIST_OPERATORS_IN_CURRENT_WORKFLOW = "listOperatorsInCurrentWorkflow";
+export const TOOL_NAME_LIST_CURRENT_LINKS = "listCurrentLinks";
+export const TOOL_NAME_GET_CURRENT_OPERATOR = "getCurrentOperator";
+
+/**
+ * Create listLinksInCurrentWorkflow tool for getting all links in the workflow
+ */
+export function createListCurrentLinksTool(workflowActionService: WorkflowActionService) {
+  return tool({
+    name: TOOL_NAME_LIST_CURRENT_LINKS,
+    description: "Get all links in the current workflow",
+    inputSchema: z.object({}),
+    execute: async () => {
+      try {
+        const links = workflowActionService.getTexeraGraph().getAllLinks();
+        return createSuccessResult(
+          {
+            links: links,
+            count: links.length,
+          },
+          [],
+          []
+        );
+      } catch (error: any) {
+        return createErrorResult(error.message);
+      }
+    },
+  });
+}
+
+export function createListOperatorsInCurrentWorkflowTool(workflowActionService: WorkflowActionService) {
+  return tool({
+    name: TOOL_NAME_LIST_OPERATORS_IN_CURRENT_WORKFLOW,
+    description: "Get all operator IDs, types and custom names in the current workflow",
+    inputSchema: z.object({}),
+    execute: async () => {
+      try {
+        const operators = workflowActionService.getTexeraGraph().getAllOperators();
+        const operatorIds = operators.map(op => op.operatorID);
+        return createSuccessResult(
+          {
+            operators: operators.map(op => ({
+              operatorId: op.operatorID,
+              operatorType: op.operatorType,
+              customDisplayName: op.customDisplayName,
+            })),
+            count: operators.length,
+          },
+          operatorIds,
+          []
+        );
+      } catch (error: any) {
+        return createErrorResult(error.message);
+      }
+    },
+  });
+}
+
+export function createGetCurrentOperatorTool(
+  workflowActionService: WorkflowActionService,
+  workflowCompilingService: WorkflowCompilingService
+) {
+  return tool({
+    name: TOOL_NAME_GET_CURRENT_OPERATOR,
+    description:
+      "Get detailed information about a specific operator in the current workflow, including its input and output schemas",
+    inputSchema: z.object({
+      operatorId: z.string().describe("ID of the operator to retrieve"),
+    }),
+    execute: async (args: { operatorId: string }) => {
+      try {
+        const operator = workflowActionService.getTexeraGraph().getOperator(args.operatorId);
+
+        // Get input schema (empty map if not available)
+        const inputSchemaMap = workflowCompilingService.getOperatorInputSchemaMap(args.operatorId);
+        const inputSchema = inputSchemaMap || {};
+
+        // Get output schema (empty map if not available)
+        const outputSchemaMap = workflowCompilingService.getOperatorOutputSchemaMap(args.operatorId);
+        const outputSchema = outputSchemaMap || {};
+
+        return createSuccessResult(
+          {
+            operator: operator,
+            inputSchema: inputSchema,
+            outputSchema: outputSchema,
+            message: `Retrieved operator ${args.operatorId}`,
+          },
+          [args.operatorId],
+          []
+        );
+      } catch (error: any) {
+        return createErrorResult(error.message || `Operator ${args.operatorId} not found`);
+      }
+    },
+  });
+}
diff --git a/frontend/src/app/workspace/service/copilot/tool/react-step-operator-parser.ts b/frontend/src/app/workspace/service/copilot/tool/react-step-operator-parser.ts
new file mode 100644
index 00000000000..2477a21579d
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/tool/react-step-operator-parser.ts
@@ -0,0 +1,152 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Central parser module to extract operator access information from tool results.
+ * Tools should populate viewedOperatorIds and modifiedOperatorIds in their results.
+ */
+
+/**
+ * Operator access information indicating which operators were viewed or modified.
+ * Tools should populate these fields in their results to indicate operator interaction.
+ */
+export interface ToolOperatorAccess {
+  viewedOperatorIds: string[];
+  modifiedOperatorIds: string[];
+}
+
+/**
+ * Parse operator access from a tool call's result.
+ * Tools should populate viewedOperatorIds and modifiedOperatorIds in their results.
+ *
+ * @param toolCall - The tool call object containing toolName and args
+ * @param toolResult - The tool result object containing the output/result with operator IDs
+ * @returns ToolOperatorAccess object with viewedOperatorIds and modifiedOperatorIds
+ */
+export function parseOperatorAccessFromToolCall(toolCall: any, toolResult?: any): ToolOperatorAccess {
+  const access: ToolOperatorAccess = { viewedOperatorIds: [], modifiedOperatorIds: [] };
+
+  if (!toolResult || !toolResult.output) {
+    return access;
+  }
+
+  try {
+    const output = toolResult.output;
+
+    // Extract viewedOperatorIds from tool result
+    if (Array.isArray(output.viewedOperatorIds)) {
+      access.viewedOperatorIds = output.viewedOperatorIds.filter((id: any) => id && typeof id === "string");
+    }
+
+    // Extract modifiedOperatorIds from tool result
+    if (Array.isArray(output.modifiedOperatorIds)) {
+      access.modifiedOperatorIds = output.modifiedOperatorIds.filter((id: any) => id && typeof id === "string");
+    }
+
+    // Remove duplicates
+    access.viewedOperatorIds = [...new Set(access.viewedOperatorIds)];
+    access.modifiedOperatorIds = [...new Set(access.modifiedOperatorIds)];
+  } catch (error) {
+    console.error("Error parsing operator access from tool result:", error);
+  }
+
+  return access;
+}
+
+/**
+ * Parse operator access for all tool calls in a step.
+ *
+ * @param toolCalls - Array of tool call objects
+ * @param toolResults - Array of corresponding tool result objects
+ * @returns Map from tool call index to ToolOperatorAccess
+ */
+export function parseOperatorAccessFromStep(toolCalls: any[], toolResults?: any[]): Map<number, ToolOperatorAccess> {
+  const accessMap = new Map<number, ToolOperatorAccess>();
+
+  if (!toolCalls || toolCalls.length === 0) {
+    return accessMap;
+  }
+
+  for (let i = 0; i < toolCalls.length; i++) {
+    const toolCall = toolCalls[i];
+    const toolResult = toolResults && toolResults[i] ? toolResults[i] : undefined;
+    const access = parseOperatorAccessFromToolCall(toolCall, toolResult);
+
+    // Only add to map if there are any viewed or modified operations
+    if (access.viewedOperatorIds.length > 0 || access.modifiedOperatorIds.length > 0) {
+      accessMap.set(i, access);
+    }
+  }
+
+  return accessMap;
+}
+
+/**
+ * Extract all viewed operator IDs from a ReActStep.
+ *
+ * @param step - The ReActStep to extract from
+ * @returns Array of unique operator IDs that were viewed
+ */
+export function getAllViewedOperatorIds(step: { operatorAccess?: Map<number, ToolOperatorAccess> }): string[] {
+  if (!step.operatorAccess) {
+    return [];
+  }
+
+  const allViewedIds: string[] = [];
+  for (const access of step.operatorAccess.values()) {
+    allViewedIds.push(...access.viewedOperatorIds);
+  }
+
+  // Return unique operator IDs
+  return [...new Set(allViewedIds)];
+}
+
+/**
+ * Extract all modified operator IDs from a ReActStep.
+ *
+ * @param step - The ReActStep to extract from
+ * @returns Array of unique operator IDs that were modified
+ */
+export function getAllModifiedOperatorIds(step: { operatorAccess?: Map<number, ToolOperatorAccess> }): string[] {
+  if (!step.operatorAccess) {
+    return [];
+  }
+
+  const allModifiedIds: string[] = [];
+  for (const access of step.operatorAccess.values()) {
+    allModifiedIds.push(...access.modifiedOperatorIds);
+  }
+
+  // Return unique operator IDs
+  return [...new Set(allModifiedIds)];
+}
+
+/**
+ * Extract all operator IDs (both viewed and modified) from a ReActStep.
+ *
+ * @param step - The ReActStep to extract from
+ * @returns Array of unique operator IDs involved in this step
+ */
+export function getAllOperatorIds(step: { operatorAccess?: Map<number, ToolOperatorAccess> }): string[] {
+  const viewedIds = getAllViewedOperatorIds(step);
+  const modifiedIds = getAllModifiedOperatorIds(step);
+
+  // Combine and return unique IDs
+  return [...new Set([...viewedIds, ...modifiedIds])];
+}
diff --git a/frontend/src/app/workspace/service/copilot/tool/tools-utility.ts b/frontend/src/app/workspace/service/copilot/tool/tools-utility.ts
new file mode 100644
index 00000000000..f098bd1d91c
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/tool/tools-utility.ts
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Tool execution timeout in milliseconds (2 minutes)
+export const TOOL_TIMEOUT_MS = 120000;
+
+// Maximum token limit for operator result data to prevent overwhelming LLM context
+// Estimated as characters / 4 (common approximation for token counting)
+export const MAX_OPERATOR_RESULT_TOKEN_LIMIT = 1000;
+
+/**
+ * Base interface for all tool execution results.
+ * Ensures consistent structure across all tools with required tracking fields.
+ */
+export interface BaseToolResult {
+  /**
+   * Indicates whether the tool execution was successful.
+   */
+  success: boolean;
+
+  /**
+   * Error message if the tool execution failed.
+   */
+  error?: string;
+
+  /**
+   * List of operator IDs that were viewed/read during tool execution.
+   * Empty array if no operators were viewed.
+   */
+  viewedOperatorIds: string[];
+
+  /**
+   * List of operator IDs that were modified/written during tool execution.
+   * Empty array if no operators were modified.
+   */
+  modifiedOperatorIds: string[];
+}
+
+/**
+ * Creates a successful tool result with default values for required fields.
+ * Tools can extend this with additional custom fields.
+ *
+ * @param data - Custom data fields for the tool result
+ * @param viewedOperatorIds - Operator IDs that were viewed (default: [])
+ * @param modifiedOperatorIds - Operator IDs that were modified (default: [])
+ * @returns BaseToolResult with success=true and provided data
+ */
+export function createSuccessResult<T extends Record<string, any>>(
+  data: T,
+  viewedOperatorIds: string[] = [],
+  modifiedOperatorIds: string[] = []
+): BaseToolResult & T {
+  return {
+    success: true,
+    viewedOperatorIds,
+    modifiedOperatorIds,
+    ...data,
+  };
+}
+
+/**
+ * Creates a failed tool result with an error message.
+ *
+ * @param error - Error message describing the failure
+ * @returns BaseToolResult with success=false and error message
+ */
+export function createErrorResult(error: string): BaseToolResult {
+  return {
+    success: false,
+    error,
+    viewedOperatorIds: [],
+    modifiedOperatorIds: [],
+  };
+}
+
+/**
+ * Estimates the number of tokens in a JSON-serializable object
+ * Uses a common approximation: tokens ≈ characters / 4
+ */
+export function estimateTokenCount(data: any): number {
+  try {
+    const jsonString = JSON.stringify(data);
+    return Math.ceil(jsonString.length / 4);
+  } catch (error) {
+    // Fallback if JSON.stringify fails
+    return 0;
+  }
+}
+
+/**
+ * Wraps a tool definition to add timeout protection to its execute function
+ * Uses AbortController to properly cancel operations on timeout
+ */
+export function toolWithTimeout(toolConfig: any): any {
+  const originalExecute = toolConfig.execute;
+
+  return {
+    ...toolConfig,
+    execute: async (args: any) => {
+      const abortController = new AbortController();
+
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() => {
+          abortController.abort();
+          reject(new Error("timeout"));
+        }, TOOL_TIMEOUT_MS);
+      });
+
+      try {
+        const argsWithSignal = { ...args, signal: abortController.signal };
+        return await Promise.race([originalExecute(argsWithSignal), timeoutPromise]);
+      } catch (error: any) {
+        if (error.message === "timeout") {
+          return createErrorResult(
+            "Tool execution timeout - operation took longer than 2 minutes. Please try again later."
+          );
+        }
+        throw error;
+      }
+    },
+  };
+}
diff --git a/frontend/src/app/workspace/service/copilot/tool/workflow-metadata-tools.ts b/frontend/src/app/workspace/service/copilot/tool/workflow-metadata-tools.ts
new file mode 100644
index 00000000000..eca6cb76afc
--- /dev/null
+++ b/frontend/src/app/workspace/service/copilot/tool/workflow-metadata-tools.ts
@@ -0,0 +1,140 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { z } from "zod";
+import { tool } from "ai";
+import { OperatorMetadataService } from "../../operator-metadata/operator-metadata.service";
+import { WorkflowUtilService } from "../../workflow-graph/util/workflow-util.service";
+
+// Tool name constants
+export const TOOL_NAME_LIST_ALL_OPERATOR_TYPES = "listAllOperatorTypes";
+export const TOOL_NAME_GET_OPERATOR_PROPERTIES_SCHEMA = "getOperatorPropertiesSchema";
+export const TOOL_NAME_GET_OPERATOR_PORTS_INFO = "getOperatorPortsInfo";
+export const TOOL_NAME_GET_OPERATOR_METADATA = "getOperatorMetadata";
+
+export function createListAllOperatorTypesTool(workflowUtilService: WorkflowUtilService) {
+  return tool({
+    name: TOOL_NAME_LIST_ALL_OPERATOR_TYPES,
+    description: "Get all available operator types in the system",
+    inputSchema: z.object({}),
+    execute: async () => {
+      try {
+        const operatorTypes = workflowUtilService.getOperatorTypeList();
+        return {
+          success: true,
+          operatorTypes: operatorTypes,
+          count: operatorTypes.length,
+        };
+      } catch (error: any) {
+        return { success: false, error: error.message };
+      }
+    },
+  });
+}
+
+/**
+ * Create getOperatorPropertiesSchema tool for getting just the properties schema
+ * More token-efficient than getOperatorSchema for property-focused queries
+ */
+export function createGetOperatorPropertiesSchemaTool(operatorMetadataService: OperatorMetadataService) {
+  return tool({
+    name: TOOL_NAME_GET_OPERATOR_PROPERTIES_SCHEMA,
+    description: "Get only the properties schema for an operator type. Use this before setting operator properties.",
+    inputSchema: z.object({
+      operatorType: z.string().describe("Type of the operator to get properties schema for"),
+    }),
+    execute: async (args: { operatorType: string }) => {
+      try {
+        const schema = operatorMetadataService.getOperatorSchema(args.operatorType);
+        const propertiesSchema = {
+          properties: schema.jsonSchema.properties,
+          required: schema.jsonSchema.required,
+          definitions: schema.jsonSchema.definitions,
+        };
+
+        return {
+          success: true,
+          propertiesSchema: propertiesSchema,
+          operatorType: args.operatorType,
+          message: `Retrieved properties schema for operator type ${args.operatorType}`,
+        };
+      } catch (error: any) {
+        return { success: false, error: error.message };
+      }
+    },
+  });
+}
+
+export function createGetOperatorPortsInfoTool(operatorMetadataService: OperatorMetadataService) {
+  return tool({
+    name: TOOL_NAME_GET_OPERATOR_PORTS_INFO,
+    description:
+      "Get input and output port information for an operator type. This is more token-efficient than getOperatorSchema and returns only port details (display names, multi-input support, etc.).",
+    inputSchema: z.object({
+      operatorType: z.string().describe("Type of the operator to get port information for"),
+    }),
+    execute: async (args: { operatorType: string }) => {
+      try {
+        const schema = operatorMetadataService.getOperatorSchema(args.operatorType);
+        const portsInfo = {
+          inputPorts: schema.additionalMetadata.inputPorts,
+          outputPorts: schema.additionalMetadata.outputPorts,
+          dynamicInputPorts: schema.additionalMetadata.dynamicInputPorts,
+          dynamicOutputPorts: schema.additionalMetadata.dynamicOutputPorts,
+        };
+
+        return {
+          success: true,
+          portsInfo: portsInfo,
+          operatorType: args.operatorType,
+          message: `Retrieved port information for operator type ${args.operatorType}`,
+        };
+      } catch (error: any) {
+        return { success: false, error: error.message };
+      }
+    },
+  });
+}
+
+export function createGetOperatorMetadataTool(operatorMetadataService: OperatorMetadataService) {
+  return tool({
+    name: TOOL_NAME_GET_OPERATOR_METADATA,
+    description:
+      "Get semantic metadata for an operator type, including user-friendly name, description, operator group, and capabilities. This is very useful to understand the semantics and purpose of each operator type - what it does, how it works, and what kind of data transformation it performs.",
+    inputSchema: z.object({
+      operatorType: z.string().describe("Type of the operator to get metadata for"),
+    }),
+    execute: async (args: { operatorType: string; signal?: AbortSignal }) => {
+      try {
+        const schema = operatorMetadataService.getOperatorSchema(args.operatorType);
+
+        const metadata = schema.additionalMetadata;
+        return {
+          success: true,
+          metadata: metadata,
+          operatorType: args.operatorType,
+          operatorVersion: schema.operatorVersion,
+          message: `Retrieved metadata for operator type ${args.operatorType}`,
+        };
+      } catch (error: any) {
+        return { success: false, error: error.message };
+      }
+    },
+  });
+}
diff --git a/core/gui/src/app/workspace/service/drag-drop/drag-drop.service.spec.ts b/frontend/src/app/workspace/service/drag-drop/drag-drop.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/drag-drop/drag-drop.service.spec.ts
rename to frontend/src/app/workspace/service/drag-drop/drag-drop.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/drag-drop/drag-drop.service.ts b/frontend/src/app/workspace/service/drag-drop/drag-drop.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/drag-drop/drag-drop.service.ts
rename to frontend/src/app/workspace/service/drag-drop/drag-drop.service.ts
diff --git a/core/gui/src/app/workspace/service/dynamic-schema/dynamic-schema.service.spec.ts b/frontend/src/app/workspace/service/dynamic-schema/dynamic-schema.service.spec.ts
similarity index 96%
rename from core/gui/src/app/workspace/service/dynamic-schema/dynamic-schema.service.spec.ts
rename to frontend/src/app/workspace/service/dynamic-schema/dynamic-schema.service.spec.ts
index 2071a88d1d2..1f891f2288e 100644
--- a/core/gui/src/app/workspace/service/dynamic-schema/dynamic-schema.service.spec.ts
+++ b/frontend/src/app/workspace/service/dynamic-schema/dynamic-schema.service.spec.ts
@@ -21,18 +21,13 @@ import { OperatorSchema } from "../../types/operator-schema.interface";
 import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
 import { UndoRedoService } from "../undo-redo/undo-redo.service";
 import { JointUIService } from "../joint-ui/joint-ui.service";
-import { TestBed, inject } from "@angular/core/testing";
+import { inject, TestBed } from "@angular/core/testing";
 import { marbles } from "rxjs-marbles";
 
 import { DynamicSchemaService } from "./dynamic-schema.service";
 import { OperatorMetadataService } from "../operator-metadata/operator-metadata.service";
 import { StubOperatorMetadataService } from "../operator-metadata/stub-operator-metadata.service";
-import {
-  mockScanPredicate,
-  mockPoint,
-  mockResultPredicate,
-  mockScanResultLink,
-} from "../workflow-graph/model/mock-workflow-data";
+import { mockPoint, mockScanPredicate } from "../workflow-graph/model/mock-workflow-data";
 import { OperatorPredicate } from "../../types/workflow-common.interface";
 import { mockScanSourceSchema } from "../operator-metadata/mock-operator-metadata.data";
 import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.service";
diff --git a/core/gui/src/app/workspace/service/dynamic-schema/dynamic-schema.service.ts b/frontend/src/app/workspace/service/dynamic-schema/dynamic-schema.service.ts
similarity index 99%
rename from core/gui/src/app/workspace/service/dynamic-schema/dynamic-schema.service.ts
rename to frontend/src/app/workspace/service/dynamic-schema/dynamic-schema.service.ts
index 36c15adee9e..e2a75927725 100644
--- a/core/gui/src/app/workspace/service/dynamic-schema/dynamic-schema.service.ts
+++ b/frontend/src/app/workspace/service/dynamic-schema/dynamic-schema.service.ts
@@ -20,8 +20,7 @@
 import { Injectable } from "@angular/core";
 import { JSONSchema7, JSONSchema7Definition } from "json-schema";
 import { cloneDeep, isEqual } from "lodash-es";
-import { Observable } from "rxjs";
-import { Subject } from "rxjs";
+import { Observable, Subject } from "rxjs";
 import { CustomJSONSchema7 } from "../../types/custom-json-schema.interface";
 import { OperatorSchema } from "../../types/operator-schema.interface";
 import { OperatorPredicate } from "../../types/workflow-common.interface";
diff --git a/core/gui/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts
rename to frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts
index 38f7dabbe04..469d19c610a 100644
--- a/core/gui/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts
+++ b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts
@@ -28,7 +28,6 @@ import { OperatorMetadataService } from "../operator-metadata/operator-metadata.
 import { StubOperatorMetadataService } from "../operator-metadata/stub-operator-metadata.service";
 import { JointUIService } from "../joint-ui/joint-ui.service";
 import { Observable, of } from "rxjs";
-import { Role, User } from "../../../common/type/user";
 
 import { mockLogicalPlan_scan_result, mockWorkflowPlan_scan_result } from "./mock-workflow-plan";
 import { HttpClient } from "@angular/common/http";
@@ -37,7 +36,6 @@ import { WorkflowSnapshotService } from "../../../dashboard/service/user/workflo
 import { DOCUMENT } from "@angular/common";
 import { WorkflowSettings } from "src/app/common/type/workflow";
 import { ComputingUnitStatusService } from "../computing-unit-status/computing-unit-status.service";
-import { JWT_OPTIONS, JwtHelperService } from "@auth0/angular-jwt";
 import { AuthService } from "src/app/common/service/user/auth.service";
 import { StubAuthService } from "src/app/common/service/user/stub-auth.service";
 import { UserService } from "src/app/common/service/user/user.service";
diff --git a/core/gui/src/app/workspace/service/execute-workflow/execute-workflow.service.ts b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts
similarity index 96%
rename from core/gui/src/app/workspace/service/execute-workflow/execute-workflow.service.ts
rename to frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts
index e0cc72344ee..cbddc01a660 100644
--- a/core/gui/src/app/workspace/service/execute-workflow/execute-workflow.service.ts
+++ b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Injectable, Inject } from "@angular/core";
+import { Inject, Injectable } from "@angular/core";
 import { Observable, Subject } from "rxjs";
 import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
 import { WorkflowGraphReadonly } from "../workflow-graph/model/workflow-graph";
@@ -30,10 +30,12 @@ import {
 } from "../../types/execute-workflow.interface";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
 import {
-  WorkflowFatalError,
   OperatorCurrentTuples,
-  TexeraWebsocketEvent,
+  RegionStateEvent,
+  RegionUpdateEvent,
   ReplayExecutionInfo,
+  TexeraWebsocketEvent,
+  WorkflowFatalError,
 } from "../../types/workflow-websocket.interface";
 import { isEqual } from "lodash-es";
 import { PAGINATION_INFO_STORAGE_KEY, ResultPaginationInfo } from "../../types/result-table.interface";
@@ -85,6 +87,9 @@ export class ExecuteWorkflowService {
     current: ExecutionStateInfo;
   }>();
 
+  private regionUpdateStream = new Subject<RegionUpdateEvent>();
+  private regionStateStream = new Subject<RegionStateEvent>();
+
   // TODO: move this to another service, or redesign how this
   //   information is stored on the frontend.
   private assignedWorkerIds: Map<string, readonly string[]> = new Map();
@@ -99,6 +104,12 @@ export class ExecuteWorkflowService {
   ) {
     workflowWebsocketService.websocketEvent().subscribe(event => {
       switch (event.type) {
+        case "RegionUpdateEvent":
+          this.regionUpdateStream.next(event);
+          break;
+        case "RegionStateEvent":
+          this.regionStateStream.next(event);
+          break;
         case "WorkerAssignmentUpdateEvent":
           this.assignedWorkerIds.set(event.operatorId, event.workerIds);
           break;
@@ -329,6 +340,14 @@ export class ExecuteWorkflowService {
     return this.executionStateStream.asObservable();
   }
 
+  public getRegionUpdateStream(): Observable<RegionUpdateEvent> {
+    return this.regionUpdateStream.asObservable();
+  }
+
+  public getRegionStateStream(): Observable<RegionStateEvent> {
+    return this.regionStateStream.asObservable();
+  }
+
   public resetExecutionState(): void {
     this.currentState = {
       state: ExecutionState.Uninitialized,
diff --git a/core/gui/src/app/workspace/service/execute-workflow/mock-result-data.ts b/frontend/src/app/workspace/service/execute-workflow/mock-result-data.ts
similarity index 97%
rename from core/gui/src/app/workspace/service/execute-workflow/mock-result-data.ts
rename to frontend/src/app/workspace/service/execute-workflow/mock-result-data.ts
index 8d2596f8432..16d6eefd72e 100644
--- a/core/gui/src/app/workspace/service/execute-workflow/mock-result-data.ts
+++ b/frontend/src/app/workspace/service/execute-workflow/mock-result-data.ts
@@ -18,7 +18,7 @@
  */
 
 import { WebDataUpdate, WebPaginationUpdate } from "../../types/execute-workflow.interface";
-import { Point, OperatorPredicate } from "../../types/workflow-common.interface";
+import { OperatorPredicate, Point } from "../../types/workflow-common.interface";
 import { IndexableObject } from "ng-zorro-antd/core/types";
 
 export const mockData: IndexableObject[] = [
diff --git a/core/gui/src/app/workspace/service/execute-workflow/mock-workflow-plan.ts b/frontend/src/app/workspace/service/execute-workflow/mock-workflow-plan.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/execute-workflow/mock-workflow-plan.ts
rename to frontend/src/app/workspace/service/execute-workflow/mock-workflow-plan.ts
index 6c0480e8250..c7222345b2c 100644
--- a/core/gui/src/app/workspace/service/execute-workflow/mock-workflow-plan.ts
+++ b/frontend/src/app/workspace/service/execute-workflow/mock-workflow-plan.ts
@@ -19,11 +19,11 @@
 
 import { WorkflowGraph } from "../workflow-graph/model/workflow-graph";
 import {
-  mockScanPredicate,
-  mockSentimentPredicate,
   mockResultPredicate,
+  mockScanPredicate,
   mockScanResultLink,
   mockScanSentimentLink,
+  mockSentimentPredicate,
   mockSentimentResultLink,
 } from "../workflow-graph/model/mock-workflow-data";
 import { LogicalPlan } from "../../types/execute-workflow.interface";
diff --git a/core/gui/src/app/workspace/service/joint-ui/joint-ui.service.spec.ts b/frontend/src/app/workspace/service/joint-ui/joint-ui.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/joint-ui/joint-ui.service.spec.ts
rename to frontend/src/app/workspace/service/joint-ui/joint-ui.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/joint-ui/joint-ui.service.ts b/frontend/src/app/workspace/service/joint-ui/joint-ui.service.ts
similarity index 96%
rename from core/gui/src/app/workspace/service/joint-ui/joint-ui.service.ts
rename to frontend/src/app/workspace/service/joint-ui/joint-ui.service.ts
index ff0c930ab7b..10d03487732 100644
--- a/core/gui/src/app/workspace/service/joint-ui/joint-ui.service.ts
+++ b/frontend/src/app/workspace/service/joint-ui/joint-ui.service.ts
@@ -26,6 +26,7 @@ import * as joint from "jointjs";
 import { fromEventPattern, Observable } from "rxjs";
 import { Coeditor } from "../../../common/type/user";
 import { OperatorResultCacheStatus } from "../../types/workflow-websocket.interface";
+
 /**
  * Defines the SVG path for the delete button
  */
@@ -60,31 +61,42 @@ c24.564,24.564,56.83,36.846,89.096,36.846s64.531-12.282,89.096-36.846C264.164,16
 c42.109,42.109,42.109,110.626,0,152.735C160.199,244.417,91.683,244.417,49.574,202.309z"/>
 <path d="M194.823,116.941H57.059c-4.971,0-9,4.029-9,9s4.029,9,9,9h137.764c4.971,0,9-4.029,9-9S199.794,116.941,194.823,116.941z"
 />`;
-
 export const addInputPortButtonSVG = `
   <svg class="add-input-port-button">
-    <g transform="scale(0.075)">${addPortButtonPath}</g>
+    <g transform="scale(0.075)">
+      ${addPortButtonPath}
+      <rect x="0" y="0" width="252" height="252" fill="transparent" pointer-events="all"/>
+    </g>
     <title>add port</title>
   </svg>
 `;
 
 export const removeInputPortButtonSVG = `
   <svg class="remove-input-port-button">
-  <g transform="scale(0.075)">${removePortButtonPath}</g>
+    <g transform="scale(0.075)">
+      ${removePortButtonPath}
+      <rect x="0" y="0" width="252" height="252" fill="transparent" pointer-events="all"/>
+    </g>
     <title>remove port</title>
   </svg>
 `;
 
 export const addOutputPortButtonSVG = `
   <svg class="add-output-port-button">
-    <g transform="scale(0.075)">${addPortButtonPath}</g>
+    <g transform="scale(0.075)">
+      ${addPortButtonPath}
+      <rect x="0" y="0" width="252" height="252" fill="transparent" pointer-events="all"/>
+    </g>
     <title>add port</title>
   </svg>
 `;
 
 export const removeOutputPortButtonSVG = `
   <svg class="remove-output-port-button">
-    <g transform="scale(0.075)">${removePortButtonPath}</g>
+    <g transform="scale(0.075)">
+      ${removePortButtonPath}
+      <rect x="0" y="0" width="252" height="252" fill="transparent" pointer-events="all"/>
+    </g>
     <title>remove port</title>
   </svg>
 `;
@@ -110,6 +122,7 @@ export const operatorIconClass = "texera-operator-icon";
 export const operatorNameClass = "texera-operator-name";
 export const operatorFriendlyNameClass = "texera-operator-friendly-name";
 export const operatorPortMetricsClass = "texera-operator-port-metrics";
+const operatorWorkerCountClass = "operator-worker-count";
 
 export const linkPathStrokeColor = "#919191";
 
@@ -127,6 +140,7 @@ class TexeraCustomJointElement extends joint.shapes.devs.Model {
       <text class="${operatorFriendlyNameClass}"></text>
       <text class="${operatorNameClass}"></text>
       <text class="${operatorPortMetricsClass}"></text>
+      <text class="${operatorWorkerCountClass}"></text>
       <text class="${operatorStateClass}"></text>
       <text class="${operatorReuseCacheTextClass}"></text>
       <text class="${operatorCoeditorEditingClass}"></text>
@@ -307,6 +321,9 @@ export class JointUIService {
     const inputMetrics = statistics.inputPortMetrics;
     const outputMetrics = statistics.outputPortMetrics;
 
+    const workerCount = statistics.numWorkers ?? 1;
+    element.attr(`.${operatorWorkerCountClass}/text`, "#workers: " + String(workerCount));
+
     inPorts.forEach(portDef => {
       const portId = portDef.id;
       if (portId != null) {
@@ -403,6 +420,7 @@ export class JointUIService {
       [`.${operatorStateClass}`]: { fill: fillColor },
       "rect.body": { stroke: fillColor },
       [`.${operatorPortMetricsClass}`]: { fill: fillColor },
+      [`.${operatorWorkerCountClass}`]: { fill: fillColor },
     });
     const element = jointPaper.getModelById(operatorID) as joint.shapes.devs.Model;
     const allPorts = element.getPorts();
@@ -790,6 +808,10 @@ export class JointUIService {
         "y-alignment": "middle",
         "x-alignment": "middle",
       },
+      [`.${operatorWorkerCountClass}`]: {
+        "ref-x": -5,
+        "ref-y": -35,
+      },
       ".delete-button": {
         x: 60,
         y: -20,
@@ -799,32 +821,32 @@ export class JointUIService {
         visibility: "hidden",
       },
       ".add-input-port-button": {
-        x: -22,
-        y: 40,
+        x: -25,
+        y: 65,
         cursor: "pointer",
         fill: "#565656",
         event: "element:add-input-port",
         visibility: "hidden",
       },
       ".remove-input-port-button": {
-        x: -22,
-        y: 60,
+        x: -25,
+        y: 85,
         cursor: "pointer",
         fill: "#565656",
         event: "element:remove-input-port",
         visibility: "hidden",
       },
       ".add-output-port-button": {
-        x: 62,
-        y: 40,
+        x: 65,
+        y: 65,
         cursor: "pointer",
         fill: "#565656",
         event: "element:add-output-port",
         visibility: "hidden",
       },
       ".remove-output-port-button": {
-        x: 62,
-        y: 60,
+        x: 65,
+        y: 85,
         cursor: "pointer",
         fill: "#565656",
         event: "element:remove-output-port",
diff --git a/frontend/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts b/frontend/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts
new file mode 100644
index 00000000000..b3e6c21acf3
--- /dev/null
+++ b/frontend/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts
@@ -0,0 +1,264 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Injectable } from "@angular/core";
+import { BehaviorSubject } from "rxjs";
+import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
+import mapping from "../../../../assets/migration_tool/mapping";
+import { OperatorLink } from "../../types/workflow-common.interface";
+import { environment } from "../../../../environments/environment";
+import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
+import { firstValueFrom } from "rxjs";
+import { NotificationService } from "src/app/common/service/notification/notification.service";
+import { debounceTime } from "rxjs/operators";
+
+@UntilDestroy()
+@Injectable({
+  providedIn: "root",
+})
+export class JupyterPanelService {
+  private jupyterNotebookPanelVisible = new BehaviorSubject<boolean>(false);
+  public jupyterNotebookPanelVisible$ = this.jupyterNotebookPanelVisible.asObservable();
+
+  private iframeRef: HTMLIFrameElement | null = null; // Store reference to iframe element
+  private cellContent: string[] = []; // Store the content of the cells
+  private highlightedCell: number | null = null; // Track the highlighted cell
+
+  // Precomputed dictionary for cell to highlight mapping
+  private cellToHighlightMapping: Record<string, { components: string[]; edges: string[] }> = {};
+
+  constructor(
+    private workflowActionService: WorkflowActionService,
+    private http: HttpClient,
+    private notificationService: NotificationService
+  ) {
+    this.workflowActionService
+      .workflowChanged()
+      .pipe(debounceTime(300))
+      .subscribe(() => {
+        console.log("Checking for existing notebook and mapping...");
+        this.fetchNotebookAndMapping();
+        console.log("Workflow graph updated, recomputing highlight mapping...");
+        this.precomputeHighlightMapping();
+      });
+    window.addEventListener("message", this.handleNotebookMessage);
+  }
+
+  private fetchNotebookAndMapping() {
+    // Fetch mapping and notebook from migration database if exists for wid
+    const workflowID = this.workflowActionService.getWorkflow().wid;
+    const dbAPIUrl = `${environment.notebookMigrationFastAPIUrl}/postgres/get_mapping_and_workflow`;
+    const headers = new HttpHeaders({ "Content-Type": "application/json" });
+    const payload = {
+      wid: workflowID,
+    };
+
+    this.http
+      .post(dbAPIUrl, payload, { headers })
+      .pipe(untilDestroyed(this))
+      .subscribe({
+        next: (response: any) => {
+          // Only load mapping and workflow if they exist
+          if (response.exists) {
+            console.log("Mapping and workflow found for wid=", workflowID, ":", response.notebook, response.mapping);
+            const mappingID = "mapping_wid_" + workflowID;
+            mapping[mappingID] = response.mapping;
+
+            const jupyterAPIUrl = `${environment.notebookMigrationFastAPIUrl}/jupyter/set_notebook`;
+
+            const requestBody = {
+              notebookName: "notebook.ipynb",
+              notebookData: response.notebook,
+            };
+
+            const headers = new HttpHeaders({
+              "Content-Type": "application/json",
+            });
+
+            try {
+              const response: any = firstValueFrom(this.http.post(jupyterAPIUrl, requestBody, { headers }));
+              console.log("Notebook successfully sent to pod:", response);
+              this.notificationService.success("Found existing Jupyter notebook and mapping.");
+            } catch (error) {
+              console.error("Error sending notebook to pod: ", error);
+              // @ts-ignore
+              this.notificationService.error("Error sending notebook to JupyterLab: " + error.message);
+            }
+          } else {
+            console.log("No pre-existing notebook and mapping.");
+          }
+        },
+        error: (error: unknown) => {
+          console.error("Network response was not ok", error);
+        },
+      });
+  }
+
+  // Precompute the dictionary for O(1) highlighting
+  private precomputeHighlightMapping(): void {
+    const wid = this.workflowActionService.getWorkflow().wid;
+
+    if (wid === undefined) {
+      console.warn("Workflow ID is undefined. Cannot compute highlight mapping.");
+      return;
+    }
+    const mappingKey = "mapping_wid_" + wid;
+
+    if (!(mappingKey in mapping)) {
+      console.warn(`Mapping key '${mappingKey}' not found. Cannot compute highlight mapping.`);
+      return;
+    }
+    const cellToOperator = mapping[mappingKey].cell_to_operator;
+
+    const allLinks: OperatorLink[] = this.workflowActionService.getTexeraGraph().getAllLinks();
+    if (allLinks.length === 0) {
+      console.warn("No links found in the graph during precompute.");
+      return;
+    }
+
+    for (const cellUUID in cellToOperator) {
+      const components = cellToOperator[cellUUID] || [];
+      const componentSet = new Set(components);
+      const edges: string[] = [];
+
+      allLinks.forEach(link => {
+        const sourceOperatorID = link.source.operatorID;
+        const targetOperatorID = link.target.operatorID;
+
+        if (
+          componentSet.has(sourceOperatorID) &&
+          componentSet.has(targetOperatorID) &&
+          sourceOperatorID !== targetOperatorID
+        ) {
+          edges.push(link.linkID);
+        }
+      });
+
+      this.cellToHighlightMapping[cellUUID] = { components, edges };
+    }
+  }
+
+  // Set the iframe reference (from the component's ViewChild)
+  setIframeRef(iframe: HTMLIFrameElement) {
+    this.iframeRef = iframe;
+    this.iframeRef.onload = () => console.log("Iframe loaded successfully.");
+  }
+
+  // Open the Jupyter Notebook panel
+  openPanel(panelName: string): void {
+    if (panelName === "JupyterNotebookPanel") {
+      this.jupyterNotebookPanelVisible.next(true);
+    }
+  }
+
+  // Close the Jupyter Notebook panel
+  closeJupyterNotebookPanel(): void {
+    this.jupyterNotebookPanelVisible.next(false);
+    const wid = this.workflowActionService.getWorkflow().wid;
+    if (wid != undefined && "mapping_wid_" + wid in mapping) {
+      delete mapping["mapping_wid_" + wid];
+    }
+  }
+
+  // Minimize the Jupyter Notebook panel
+  public minimizeJupyterNotebookPanel(): void {
+    this.jupyterNotebookPanelVisible.next(false);
+  }
+
+  // Expand the Jupyter Notebook panel
+  public openJupyterNotebookPanel(): void {
+    const wid = this.workflowActionService.getWorkflow().wid;
+    const mappingKey = "mapping_wid_" + wid;
+
+    // Check if there is corresponding mapping data
+    if (wid === undefined || !(mappingKey in mapping)) {
+      console.warn("No Jupyter notebook found for this workflow. Cannot open panel.");
+      this.notificationService.warning("No Jupyter notebook associated with this workflow.");
+      return;
+    }
+
+    // Expand only if the mapping exists
+    this.jupyterNotebookPanelVisible.next(true);
+  }
+
+  // Handle messages from the Jupyter notebook iframe
+  private handleNotebookMessage = (event: MessageEvent) => {
+    const allowedOrigins = [window.location.origin, environment.jupyterAPIUrl];
+    if (!allowedOrigins.includes(event.origin)) {
+      console.log("Invalid origin:", event.origin);
+      return;
+    }
+
+    const { action, cellIndex, cellContent, cellUUID } = event.data;
+
+    if (action === "cellClicked") {
+      this.highlightedCell = cellIndex;
+      this.cellContent[cellIndex] = cellContent || `Cell ${cellIndex + 1}`;
+      this.highlightFromCell(cellUUID);
+    }
+  };
+
+  // Highlight operators and edges based on the clicked cell
+  private highlightFromCell(cellUUID: string): void {
+    const highlightData = this.cellToHighlightMapping[cellUUID] || { components: [], edges: [] };
+
+    // Unhighlight all operators and links
+    this.workflowActionService.unhighlightOperators(
+      ...this.workflowActionService
+        .getTexeraGraph()
+        .getAllOperators()
+        .map(op => op.operatorID)
+    );
+    this.workflowActionService.unhighlightLinks(
+      ...this.workflowActionService
+        .getTexeraGraph()
+        .getAllLinks()
+        .map(link => link.linkID)
+    );
+
+    // Highlight components and edges
+    if (highlightData.components.length > 0) {
+      this.workflowActionService.highlightOperators(true, ...highlightData.components);
+    }
+    if (highlightData.edges.length > 0) {
+      this.workflowActionService.highlightLinks(true, ...highlightData.edges);
+    }
+
+    console.log(`Highlighted components: ${highlightData.components}, edges: ${highlightData.edges}`);
+  }
+
+  // Handle when a Texera component is clicked to trigger the corresponding notebook cell
+  onWorkflowComponentClick(cellUUID: string): void {
+    if (this.iframeRef && this.iframeRef.contentWindow) {
+      const wid = this.workflowActionService.getWorkflow().wid;
+      const operatorArray = mapping[wid != undefined ? "mapping_wid_" + wid : "default"]["operator_to_cell"][cellUUID];
+      if (operatorArray) {
+        this.iframeRef.contentWindow.postMessage(
+          { action: "triggerCellClick", operators: operatorArray },
+          environment.jupyterAPIUrl
+        );
+      } else {
+        console.error(`No operators found for cellUUID: ${cellUUID}`);
+      }
+    } else {
+      console.error("Iframe reference is null.");
+    }
+  }
+}
diff --git a/frontend/src/app/workspace/service/notebook-migration/migration-llm.ts b/frontend/src/app/workspace/service/notebook-migration/migration-llm.ts
new file mode 100644
index 00000000000..4a657309dca
--- /dev/null
+++ b/frontend/src/app/workspace/service/notebook-migration/migration-llm.ts
@@ -0,0 +1,248 @@
+import { Injectable } from "@angular/core";
+import { firstValueFrom, from, Observable, of } from "rxjs";
+import { map } from "rxjs/operators";
+import { createOpenAI } from "@ai-sdk/openai";
+import { generateText, type ModelMessage } from "ai";
+import { AppSettings } from "../../../common/app-setting";
+import { v4 as uuidv4 } from 'uuid';
+import { TEXERA_OVERVIEW, TUPLE_DOCUMENTATION, TABLE_DOCUMENTATION, OPERATOR_DOCUMENTATION, UDF_INPUT_PORT_DOCUMENTATION, EXAMPLE_OF_GOOD_CONVERSION, VISUALIZER_DOCUMENTATION, EXAMPLE_OF_MULTIPLE_UDF_CONVERSION, WORKFLOW_PROMPT, MAPPING_PROMPT } from "./migration-prompts";
+
+interface Cell {
+  cell_type: string;
+  metadata: { [key: string]: any };
+  source: string;
+}
+
+export interface Notebook {
+  cells: Cell[];
+}
+
+interface WorkflowJSON {
+  operators: any[];
+  operatorPositions: Record<string, { x: number; y: number }>;
+  links: any[];
+  commentBoxes: any[];
+  settings: {
+    dataTransferBatchSize: number;
+  };
+}
+
+interface CombinedMapping {
+  operator_to_cell: Record<string, string[]>;
+  cell_to_operator: Record<string, string[]>;
+}
+
+@Injectable()
+export class NotebookMigrationLLM {
+  private model: any;
+  private messages: ModelMessage[] = [];
+  private initialized = false;
+
+  private static readonly DOCUMENTATION: string[] = [
+    TEXERA_OVERVIEW,
+    TUPLE_DOCUMENTATION,
+    TABLE_DOCUMENTATION,
+    OPERATOR_DOCUMENTATION,
+    EXAMPLE_OF_GOOD_CONVERSION,
+    VISUALIZER_DOCUMENTATION,
+    UDF_INPUT_PORT_DOCUMENTATION,
+    EXAMPLE_OF_MULTIPLE_UDF_CONVERSION
+  ];
+
+  /**
+   * Initialize a new LLM session with Texera documentation
+   */
+  public initialize(modelType: string): void {
+    console.log("Initializing new Notebook Migration LLM session")
+    this.model = createOpenAI({
+      baseURL: new URL(`${AppSettings.getApiEndpoint()}`, document.baseURI).toString(),
+      // apiKey is required by the library for creating the OpenAI compatible client;
+      // For security reason, we store the apiKey at the backend, thus the value is dummy here.
+      apiKey: "dummy",
+    }).chat(modelType);
+
+    this.messages = [
+      ...NotebookMigrationLLM.DOCUMENTATION.map((doc): ModelMessage => ({
+        role: "system",
+        content: doc,
+      })),
+    ];
+
+    this.initialized = true;
+  }
+
+  /**
+   * Send a prompt and receive a response.
+   * All prior documentation and conversation is preserved.
+   */
+  private sendPrompt(prompt: string): Observable<string> {
+    if (!this.initialized) {
+      throw new Error("LLM session not initialized");
+    }
+
+    this.messages.push({
+      role: "user",
+      content: prompt,
+    });
+
+    return from(
+      generateText({
+        model: this.model,
+        messages: this.messages,
+      })
+    ).pipe(
+      map(result => {
+        this.messages.push({
+          role: "assistant",
+          content: result.text,
+        });
+
+        return result.text;
+      })
+    );
+  }
+
+  /**
+   * Send a Jupyter Notebook to be converted into a workflow and mapping.
+   */
+  public async convertNotebookToWorkflow(notebook: Notebook): Promise<Observable<string>> {
+    if (!this.initialized) {
+      throw new Error("LLM session not initialized");
+    }
+
+    const codeCells = notebook.cells.filter(cell => cell.cell_type === 'code');
+    const notebookString = codeCells
+      .map(cell => {
+        const uuid = String(cell.metadata.uuid);
+        return `# START ${uuid}\n${cell.source}\n# END ${uuid}`;
+      })
+      .join('\n\n');
+
+    console.log("Sending notebook to LLM")
+    const workflow = await firstValueFrom(this.sendPrompt(`${WORKFLOW_PROMPT}\n${notebookString}`));
+    const mapping = await firstValueFrom(this.sendPrompt(MAPPING_PROMPT));
+    console.log("Workflow and mapping received from LLM")
+
+    // Remove ```json blocks and parse
+    const udfOpenAiResponse = JSON.parse(
+      workflow.replace(/^```json\s*|```$/g, '').trim()
+    );
+
+    const workflowJSON: WorkflowJSON = {
+      operators: [],
+      operatorPositions: {},
+      links: [],
+      commentBoxes: [],
+      settings: {
+        dataTransferBatchSize: 400
+      }
+    };
+
+    const udfMappingToUUID: Record<string, string> = {};
+
+    Object.entries(udfOpenAiResponse.code).forEach(([udfId, udfCode], i) => {
+      const udfUUID = `PythonUDFV2-operator-${uuidv4()}`;
+      udfMappingToUUID[udfId] = udfUUID;
+
+      let udfOutputColumns: { attributeName: string; attributeType: string }[] = [];
+      if (udfOpenAiResponse.outputs && udfOpenAiResponse.outputs[udfId]) {
+        udfOutputColumns = udfOpenAiResponse.outputs[udfId].map((attr: string) => ({
+          attributeName: attr,
+          attributeType: 'binary'
+        }));
+      }
+
+      // Add UDF to operators
+      workflowJSON.operators.push({
+        operatorID: udfUUID,
+        operatorType: 'PythonUDFV2',
+        operatorVersion: '3d69fdcedbb409b47162c4b55406c77e54abe416',
+        operatorProperties: {
+          code: udfCode,
+          workers: 1,
+          retainInputColumns: false,
+          outputColumns: udfOutputColumns
+        },
+        inputPorts: [
+          {
+            portID: 'input-0',
+            displayName: '',
+            allowMultiInputs: true,
+            isDynamicPort: false,
+            dependencies: []
+          }
+        ],
+        outputPorts: [
+          {
+            portID: 'output-0',
+            displayName: '',
+            allowMultiInputs: false,
+            isDynamicPort: false
+          }
+        ],
+        showAdvanced: false,
+        isDisabled: false,
+        customDisplayName: udfId,
+        dynamicInputPorts: true,
+        dynamicOutputPorts: true
+      });
+
+      // Add UDF to operatorPositions
+      workflowJSON.operatorPositions[udfUUID] = { x: 140 * (i + 1), y: 0 };
+    });
+
+    // Add links/edges
+    (udfOpenAiResponse.edges || []).forEach(([source, target]: [string, string]) => {
+      workflowJSON.links.push({
+        linkID: `link-${uuidv4()}`,
+        source: {
+          operatorID: udfMappingToUUID[source],
+          portID: 'output-0'
+        },
+        target: {
+          operatorID: udfMappingToUUID[target],
+          portID: 'input-0'
+        }
+      });
+    });
+
+    // Parse mapping
+    const parsedMapping: Record<string, string[]> = JSON.parse(
+      mapping.replace(/^```json\s*|```$/g, '').trim()
+    );
+
+    const udfToCell: Record<string, string[]> = {};
+    const cellToUdf: Record<string, string[]> = {};
+
+    Object.entries(parsedMapping).forEach(([udf, cells]) => {
+      const udfUUID = udfMappingToUUID[udf];
+      udfToCell[udfUUID] = cells;
+      cells.forEach(cell => {
+        if (!cellToUdf[cell]) {
+          cellToUdf[cell] = [udfUUID];
+        } else {
+          cellToUdf[cell].push(udfUUID);
+        }
+      });
+    });
+
+    const workflowNotebookMapping: CombinedMapping = {
+      operator_to_cell: udfToCell,
+      cell_to_operator: cellToUdf
+    };
+
+    const result = JSON.stringify({ workflowJSON, workflowNotebookMapping });
+    return of(result);
+  }
+
+  /**
+   * Closes the session.
+   * Clears all context and releases references.
+   */
+  public close(): void {
+    this.messages = [];
+    this.model = null;
+    this.initialized = false;
+    console.log("Notebook Migration LLM session closed")
+  }
+}
diff --git a/frontend/src/app/workspace/service/notebook-migration/migration-prompts.ts b/frontend/src/app/workspace/service/notebook-migration/migration-prompts.ts
new file mode 100644
index 00000000000..519d12cf484
--- /dev/null
+++ b/frontend/src/app/workspace/service/notebook-migration/migration-prompts.ts
@@ -0,0 +1,410 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// TEXERA DOCUMENTATION
+
+// https://github.com/Texera/texera/wiki/Guide-to-Use-a-Python-UDF
+export const TEXERA_OVERVIEW = `
+You are a robust compiler that takes python code and translates it to our personal workflow environment Texera that uses python.
+
+  Texera is a data analytics tool that uses workflows to do machine learning and data analytics computation. User's are able to drag and drop operators and connect their inputs and outputs in a workflow graphical user interface, which the code we are going to create.
+
+Texera is able to use Python user defined functions. Documentation of a Python UDF in Texera follows:
+  Process Data APIs
+
+There are three APIs to process the data in different units.
+
+  Tuple API.
+
+  class ProcessTupleOperator(UDFOperatorV2):
+
+def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:
+yield tuple_
+
+Tuple API takes one input tuple from a port at a time. It returns an iterator of optional TupleLike instances. A TupleLike is any data structure that supports key-value pairs, such as pytexera.Tuple, dict, defaultdict, NamedTuple, etc.
+
+  Tuple API is useful for implementing functional operations which are applied to tuples one by one, such as map, reduce, and filter.
+
+  Table API.
+
+  class ProcessTableOperator(UDFTableOperator):
+
+def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:
+yield table
+
+Table API consumes a Table at a time, which consists of all the tuples from a port. It returns an iterator of optional TableLike instances. A TableLike is a collection of TupleLike, and currently, we support pytexera.Table and pandas.DataFrame as a TableLike instance. More flexible types will be supported down the road.
+
+  Table API is useful for implementing blocking operations that will consume all the data from one port, such as join, sort, and machine learning training.
+
+  Batch API.
+
+  class ProcessBatchOperator(UDFBatchOperator):
+
+BATCH_SIZE = 10
+
+def process_batch(self, batch: Batch, port: int) -> Iterator[Optional[BatchLike]]:
+yield batch
+
+Batch API consumes a batch of tuples at a time. Similar to Table, a Batch is also a collection of Tuples; however, its size is defined by the BATCH_SIZE, and one port can have multiple batches. It returns an iterator of optional BatchLike instances. A BatchLike is a collection of TupleLike, and currently, we support pytexera.Batch and pandas.DataFrame as a BatchLike instance. More flexible types will be supported down the road.
+
+  The Batch API serves as a hybrid API combining the features of both the Tuple and Table APIs. It is particularly valuable for striking a balance between time and space considerations, offering a trade-off that optimizes efficiency.
+
+  All three APIs can return an empty iterator by yield None.
+
+  The template code for a Python UDF follows: MAKE SURE TO USE THE CLASS NAMES AND FUNCTIONS DEFINED, THIS IS A MUST FOR THE PROGRAM TO WORK. SELECT 1 OUT OF THE 3 PROCESSING OPERATOR FUNCTIONS TO BUILD DEPENDINGO ON THE CONTEXT OF CODE TRANSLATION.
+# Choose from the following templates:
+  #
+# from pytexera import *
+#
+# class ProcessTupleOperator(UDFOperatorV2):
+#
+#     @overrides
+#     def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:
+#         yield tuple_
+#
+# class ProcessBatchOperator(UDFBatchOperator):
+#     BATCH_SIZE = 10 # must be a positive integer
+#
+#     @overrides
+#     def process_batch(self, batch: Batch, port: int) -> Iterator[Optional[BatchLike]]:
+#         yield batch
+#
+# class ProcessTableOperator(UDFTableOperator):
+#
+#     @overrides
+#     def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:
+#         yield table
+`;
+
+// https://github.com/Texera/texera/blob/1fa249a9d55d4dcad36d93e093c2faed5c4434f0/core/amber/src/main/python/core/models/tuple.py
+export const TUPLE_DOCUMENTATION = `
+### **<code>Tuple</code> Class Overview**
+
+The \`Tuple\` class is a **lazy-evaluated** data structure designed for efficient field storage and access. It provides:
+
+  1. **Support for Multiple Data Sources**:
+* Can be initialized from a \`TupleLike\` object, such as a \`pandas.Series\`, \`OrderedDict\`, or another \`Tuple\` instance.
+* Works with \`ArrowTableTupleProvider\` to access \`pyarrow.Table\` data.
+2. **Lazy Field Evaluation**:
+* Field values can be either **directly stored values** or **lazy accessors** (\`field_accessor\`).
+* If a field is accessed and is an accessor, it is evaluated and cached.
+3. **Schema (<code>Schema</code>) Enforcement**:
+  * A \`Tuple\` can be created without a schema but can be **finalized** with one using \`finalize(schema)\`, which:
+* **Casts field values** (e.g., \`NaN → None\`, \`Object → Bytes\`).
+* **Validates field completeness**, ensuring all fields match the \`Schema\`.
+4. **Pythonic Access Patterns**:
+* **Index-based access**: \`tuple["field_name"]\` or \`tuple[index]\` retrieves field values.
+* **Dictionary-like operations**: \`tuple.as_dict()\` returns an \`OrderedDict\`, and \`tuple.as_series()\` converts to a \`pandas.Series\`.
+* **Iterable support**: \`for field in tuple\` iterates over field values.
+5. **Hashing and Comparisons**:
+* Implements \`__hash__\` using a Java-like hashing algorithm, allowing usage as dictionary keys.
+* Implements \`__eq__\`, supporting equality checks based on field contents.
+6. **Partial Data Extraction**:
+* \`tuple.get_partial_tuple(attribute_names)\` returns a new \`Tuple\` instance containing only the specified fields.
+`;
+
+// https://github.com/Texera/texera/blob/1fa249a9d55d4dcad36d93e093c2faed5c4434f0/core/amber/src/main/python/core/models/table.py
+export const TABLE_DOCUMENTATION = `### **<code>Table</code> Class Overview**
+
+The \`Table\` class extends \`pandas.DataFrame\`, providing **structured Tuple-based data management**. It is designed to integrate seamlessly with \`Tuple\` objects.
+
+#### **Key Features:**
+
+1. **Flexible Construction:**
+* Can be initialized from various sources:
+* Another \`Table\` (\`from_table(table)\`)
+* A \`pandas.DataFrame\` (\`from_data_frame(df)\`)
+* A list/iterator of \`TupleLike\` objects (\`from_tuple_likes(tuple_likes)\`)
+* Ensures all \`Tuple\` objects in a \`Table\` have **consistent field names**.
+2. **Tuple Conversion:**
+* \`as_tuples()\`: Converts the table rows into an **iterator of <code>Tuple</code> instances**, preserving the row order.
+3. **Equality Comparison (<code>__eq__</code>):**
+* Supports **row-wise equality checks** by comparing the underlying \`Tuple\` objects.
+4. **Universal Tuple Output (<code>all_output_to_tuple</code>):**
+* A helper function to convert **various data types** into \`Tuple\` iterators, supporting:
+* \`None\` → \`[None]\`
+* \`Table\` → \`as_tuples()\`
+* \`pandas.DataFrame\` → Converted into a \`Table\`, then to Tuples
+* \`List[TupleLike]\` → Converted to \`Tuple\` instances
+* A single \`TupleLike\` or \`Tuple\` → Wrapped in an iterator
+
+#### **Relation to <code>Tuple</code>:**
+
+* \`Table\` **stores multiple <code>Tuple</code> objects** and ensures schema consistency across rows.
+* Provides an **efficient bridge** between \`Tuple\`-based data and \`pandas.DataFrame\`, enabling compatibility with Python's data analysis tools.
+`;
+
+// https://github.com/Texera/texera/blob/42d803310c180978a9f02992f0e05556796b293c/core/amber/src/main/python/core/models/operator.py
+export const OPERATOR_DOCUMENTATION = `### **Operator Class Overview**
+
+The \`Operator\` class is an **abstract base class (ABC)** for all operators, defining the fundamental structure for processing \`Tuple\`, \`Batch\`, and \`Table\` data in a workflow.
+
+#### **Key Features & Hierarchy**
+
+1. **Base <code>Operator</code> Class**:
+* Defines lifecycle methods: \`open()\` and \`close()\`.
+* Supports a **source flag (<code>is_source</code>)** to distinguish source operators from others.
+2. **Tuple-Based Processing (<code>TupleOperatorV2</code>)**:
+* Processes individual \`Tuple\` objects through \`process_tuple(tuple_, port)\`.
+* Calls \`on_finish(port)\` when an input port is exhausted.
+3. **Types of Operators**:
+* **SourceOperator**:
+* Produces data via \`produce()\`, yielding \`TupleLike\` or \`TableLike\` objects.
+* Overrides \`on_finish(port)\` to output produced data.
+* **BatchOperator**:
+* Collects tuples into batches (\`BATCH_SIZE\`) before processing via \`process_batch(batch, port)\`.
+* Converts processed batches (typically \`pandas.DataFrame\`) into \`Tuple\` output.
+* **TableOperator**:
+* Collects tuples into a \`Table\` before processing via \`process_table(table, port)\`.
+* Converts processed \`Table\` output back into tuples.
+4. **Data Flow & Processing**:
+* Operators receive data **tuple-by-tuple**, **batch-by-batch**, or **table-by-table** depending on the type.
+* Results are **iterators** of transformed data (\`TupleLike\`, \`BatchLike\`, or \`TableLike\`).
+5. **Deprecated <code>TupleOperator</code>**:
+* The older version of \`TupleOperator\` is deprecated in favor of \`TupleOperatorV2\`.
+
+#### Relation to <code>Tuple</code> and <code>Table</code>
+
+* Operators **consume and transform** \`Tuple\` and \`Table\` data within a workflow.
+* **Tuple-based operators** process row-wise, while **Table operators** handle structured table transformations.
+* **Source operators** initiate the data flow by generating tuples or tables.`;
+
+export const UDF_INPUT_PORT_DOCUMENTATION = `
+Python UDF operators support multiple input and output ports, allowing a single operator to receive different types of data from various upstream operators. In the process_tuple(self, tuple_: Tuple, port: int) function in ProcessTupleOperator and the process_table(self, table: Table, port: int) function in ProcessTableOperator, the port parameter indicates the input port. The port numbers are assigned in order, starting from 0 to N, from top to bottom. When input data have different schemas, it is necessary to assign them to different input ports. However, if all input data share the same schema, additional ports are not required. In both ProcessTupleOperator and ProcessTableOperator, there is an on_finish(self, port: int) function that is executed only after all the tuples from the specified port are processed.
+
+Using this knowledge, for situations where multiple upstream UDFs act as input to a single UDF, we can introduce an intermediary UDF that collects all of the input data and reformats it into a single table, which is then passed as input to the original next downstream UDF. When it is necessary for this to occur in your translation from notebook to UDFs, include the intermediary UDF and make sure that it and the next operator that uses its output is formatted correctly and handles the data transfer properly.
+`;
+
+export const EXAMPLE_OF_GOOD_CONVERSION = `
+Here is an example of python code translated into a compatible Texera UDF that gives output that abides the output schema compatible with the Texera workflow operators for tuples. Other operators do not always follow this strict format, but the yielding output structure is important.
+
+Python Code (high level idea): We have a python code that given some data, we limit the number of data.
+
+Texera Operator code:
+from pytexera import *
+
+class ProcessTupleOperator(UDFOperatorV2):
+def __init__(self):
+self.limit = 10
+self.count = 0
+@overrides
+def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:
+if(self.count < self.limit):
+self.count += 1
+yield tuple_
+
+`;
+
+export const VISUALIZER_DOCUMENTATION = `
+Texera requires a unique way of generating visualizations from ML libraries:
+1. Ensures one yield per operator (per Texera’s UDF constraints).
+2. Uses Plotly for visualization and outputs results as embeddable HTML.
+3. Error handling is built-in to notify users when data is missing.
+`;
+
+export const EXAMPLE_OF_MULTIPLE_UDF_CONVERSION = `
+Here is an example of breaking up python code into multiple Texera UDFs. Format your response structure exactly like the given example. The "code" key contains a dictionary of the UDF ID's with their respective code. The "edges" key contains a list of pairs that contains the connections between UDFs. The "outputs" key contains a dictionary of the UDF ID's with a list of variable names that they yield in the UDF code. The UDFs can branch and merge, it does not have to be a linear chain depending on your implementation.
+
+Original Code:
+\`\`\`python
+# START CELL1
+import pandas as pd
+from sklearn.model_selection import train_test_split
+from sklearn.ensemble import RandomForestClassifier
+from sklearn.svm import SVC
+from sklearn.tree import DecisionTreeClassifier
+from sklearn.linear_model import LogisticRegression
+from sklearn.metrics import accuracy_score
+from sklearn.preprocessing import StandardScaler
+import matplotlib.pyplot as plt
+# END CELL1
+
+# START CELL2
+# Load the dataset
+file_path = 'diabetes.csv'
+data = pd.read_csv(file_path)
+# END CELL2
+
+# START CELL3
+# Remove duplicate rows
+data = data.drop_duplicates()
+
+# Remove rows with null values
+data = data.dropna()
+# END CELL3
+
+# START CELL4
+# Print the minimum, maximum, and mean for all fields
+print("Minimum values:\n", data.min())
+print("\nMaximum values:\n", data.max())
+print("\nMean values:\n", data.mean())
+# END CELL 4
+
+# START CELL5
+# Create a boxplot for the 'Pregnancies' field
+plt.figure(figsize=(8, 6))
+plt.boxplot(data['Pregnancies'], vert=False, patch_artist=True)
+plt.title('Boxplot of Pregnancies')
+plt.xlabel('Number of Pregnancies')
+plt.show()
+# END CELL5
+
+# START CELL6
+# Separate features and target variable
+X = data.drop('Outcome', axis=1)
+y = data['Outcome']
+# END CELL6
+
+# START CELL7
+# Split data into training and testing sets (80% train, 20% test)
+X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_state=42)
+
+scaler = StandardScaler()
+X_train = scaler.fit_transform(X_train)
+X_test = scaler.transform(X_test)
+# END CELL7
+
+# START CELL8
+# Train Random Forest model
+rf_model = RandomForestClassifier(random_state=42)
+rf_model.fit(X_train, y_train)
+rf_pred = rf_model.predict(X_test)
+rf_accuracy = accuracy_score(y_test, rf_pred)
+print(f"Random Forest Accuracy: {rf_accuracy:.2%}")
+# END CELL8
+
+# START CELL9
+# Train SVM model
+svm_model = SVC(random_state=42)
+svm_model.fit(X_train, y_train)
+svm_pred = svm_model.predict(X_test)
+svm_accuracy = accuracy_score(y_test, svm_pred)
+print(f"SVM Accuracy: {svm_accuracy:.2%}")
+# END CELL9
+\`\`\`
+
+Texera UDF conversion:
+\`\`\`json
+{
+    "code": {
+        "UDF1": "# UDF1\nfrom pytexera import *\nimport pandas as pd\nfrom typing import Iterator, Optional\n\nclass ProcessTableOperator(UDFTableOperator):\n\n    @overrides\n    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n        # Remove duplicate rows\n        data = table.drop_duplicates()\n\n        # Remove rows with null values\n        data = data.dropna()\n\n        # Calculate statistics\n        min_values = data.min()\n        max_values = data.max()\n        mean_values = data.mean()\n\n        # Create a DataFrame to yield\n        result_table = pd.DataFrame({\n            'min_values': [min_values],\n            'max_values': [max_values],\n            'mean_values': [mean_values],\n            'data': [data]\n        })\n\n        yield Table(result_table)",
+        "UDF2": "# UDF2\nfrom pytexera import *\nimport pandas as pd\nimport plotly.express as px\nimport plotly.io\nfrom typing import Iterator, Optional\n\nclass ProcessTableOperator(UDFTableOperator):\n    def render_error(self, error_msg):\n        return '''<h1>Boxplot is not available.</h1>\n                  <p>Reason is: {} </p>\n               '''.format(error_msg)\n\n    @overrides\n    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n        data = table['data'].iloc[0]\n\n        if data.empty:\n            yield {'html-content': self.render_error('input table is empty.')}\n            return\n\n        # Create a boxplot for the 'Pregnancies' field\n        fig = px.box(data, x='Pregnancies')\n        fig.update_layout(margin=dict(l=0, r=0, t=0, b=0))\n\n        # Convert fig to HTML content\n        html = plotly.io.to_html(fig, include_plotlyjs='cdn', auto_play=False)\n        yield {'html-content': html}",
+        "UDF3": "# UDF3\nfrom pytexera import *\nimport pandas as pd\nfrom sklearn.model_selection import train_test_split\nfrom sklearn.preprocessing import StandardScaler\nfrom typing import Iterator, Optional\n\nclass ProcessTableOperator(UDFTableOperator):\n\n    @overrides\n    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n        data = table['data'].iloc[0]\n\n        # Separate features and target variable\n        X = data.drop('Outcome', axis=1)\n        y = data['Outcome']\n\n        # Split data into training and testing sets (80% train, 20% test)\n        X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_state=42)\n\n        scaler = StandardScaler()\n        X_train = scaler.fit_transform(X_train)\n        X_test = scaler.transform(X_test)\n\n        # Create a DataFrame to yield\n        result_table = pd.DataFrame({\n            'X_train': [X_train], 'X_test': [X_test],\n            'y_train': [y_train], 'y_test': [y_test]\n        })\n\n        yield Table(result_table)",
+        "UDF4": "# UDF4\nfrom pytexera import *\nimport pandas as pd\nfrom sklearn.ensemble import RandomForestClassifier\nfrom sklearn.metrics import accuracy_score\nfrom typing import Iterator, Optional\n\nclass ProcessTableOperator(UDFTableOperator):\n\n    @overrides\n    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n        X_train = table['X_train'].iloc[0]\n        y_train = table['y_train'].iloc[0]\n        X_test = table['X_test'].iloc[0]\n        y_test = table['y_test'].iloc[0]\n\n        # Train Random Forest model\n        rf_model = RandomForestClassifier(random_state=42)\n        rf_model.fit(X_train, y_train)\n        rf_pred = rf_model.predict(X_test)\n        rf_accuracy = accuracy_score(y_test, rf_pred)\n\n        # Create a DataFrame to yield\n        result_table = pd.DataFrame({\n            'rf_model': [rf_model],\n            'rf_accuracy': [rf_accuracy],\n            'X_test': [X_test],\n            'y_test': [y_test]\n        })\n\n        yield Table(result_table)",
+        "UDF5": "# UDF5\nfrom pytexera import *\nimport pandas as pd\nfrom sklearn.svm import SVC\nfrom sklearn.metrics import accuracy_score\nfrom typing import Iterator, Optional\n\nclass ProcessTableOperator(UDFTableOperator):\n\n    @overrides\n    def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n        X_train = table['X_train'].iloc[0]\n        y_train = table['y_train'].iloc[0]\n        X_test = table['X_test'].iloc[0]\n        y_test = table['y_test'].iloc[0]\n\n        # Train SVM model\n        svm_model = SVC(random_state=42)\n        svm_model.fit(X_train, y_train)\n        svm_pred = svm_model.predict(X_test)\n        svm_accuracy = accuracy_score(y_test, svm_pred)\n\n        # Create a DataFrame to yield\n        result_table = pd.DataFrame({\n            'svm_model': [svm_model],\n            'svm_accuracy': [svm_accuracy],\n            'X_test': [X_test],\n            'y_test': [y_test]\n        })\n\n        yield Table(result_table)"
+    },
+    "edges": [
+        ["UDF1", "UDF2"],
+        ["UDF1", "UDF3"],
+        ["UDF3", "UDF4"],
+        ["UDF3", "UDF5"]
+    ],
+    "outputs": {
+        "UDF1": ["min_values", "max_values", "mean_values", "data"],
+        "UDF2": ["html-content"],
+        "UDF3": ["X_train", "X_test", "y_train", "y_test"],
+        "UDF4": ["rf_model", "rf_accuracy", "X_test", "y_test"],
+        "UDF5": ["svm_model", "svm_accuracy", "X_test", "y_test"]
+    }
+}
+\`\`\`
+`;
+
+export const WORKFLOW_PROMPT = `You are an expert in Python coding and workflow systems.
+Many users of Texera system are non-technical, but the notebooks they provide are written by technical people.
+They want to convert their notebooks to Texera workflows.
+Your goal is to help convert these notebooks into a Texera workflow that non-technical users can use directly.
+So do not remove or modify any classes or functions, preserve their names and structure as they are.
+Ensure that all essential logic remains intact.
+Create multiple Texera UDF codes using the provided Python code.
+Number each UDF, starting at 1 and incrementing, by starting with a comment that states that UDF number.
+
+Use the class and function names as shown in ProcessTupleOperator, ProcessTableOperator, and ProcessBatchOperator.
+Do not change the class names, function names, or input parameters.
+Use the ones that make sense and split the code meaningfully as instructed.
+
+Use the starter code provided for Python UDFs.
+
+Use the documentation of Table, Tuple, or Batch to work with parameters within Texera UDF.
+Do not import other libraries to define these types.
+
+There is no need for an __init__ function. Assume all inputs are valid pandas DataFrames,
+so do not use .to_pandas(), .to_dataframe(), etc. Do not load data from a file in the first UDF, assume
+that the data is already given to you in the table parameter.
+Ensure proper data flow between functions. Separate operators as if they will run in different files.
+
+Current UDF operators can only have one output. Build a dataframe to yield all necessary variables
+and data. Ensure proper data flow for each UDF and all information is yielded (including training
+and testing data) if subsequent UDFs need them.
+
+Ensure all necessary imports are included in each UDF code block.
+
+Each UDF operator should be in its own Python code block. Do not combine them into a single block.
+Ensure import statements cover all used functions and separate them as necessary.
+
+It is VERY important that all of the original code in the Jupyter notebook is represented in the generated workflow.
+Make sure that nothing in the original is removed and that the semantic meaning of what the original code was doing is retained.
+If there are user-defined Python classes, include the entire class definition in the appropriate UDF(s) that use that class.
+Always include the code that defines the class inside of every distinct UDF that uses that constructs an object of that class.
+Python classes are allowed in Texera UDFs and follow the same semantics as standard Python.
+They can be defined outside of ProcessTableOperator, ProcessTupleOperator, and ProcessBatchOperator.
+
+Return only the JSON formatted response, do not give any explanation.
+Make sure the response is a valid JSON structure, including closing all braces and not including commas after the last element.
+Follow this JSON format (don't reuse the values, this is just the format). 'code', 'edges', and 'outputs' are all their own key's, do not nest any of these in another one and make sure to close their braces:
+{
+"code": {
+"UDF1": "code for UDF1 goes here",
+"UDF2": "code for UDF2 goes here"
+},
+"edges": [
+["UDF1", "UDF2"]
+],
+"outputs": {
+"UDF1": ["min_values", "max_values", "mean_values", "data"],
+"UDF2": ["html-content"]
+}
+}
+Make sure only the keys in the code section appear in the edges and outputs sections. Do not include any extraneous fields.
+Do not include any extraneous UDF's in the code field that include empty strings.
+Give ALL of the code, do not omit anything or use placeholders for code. Make sure ALL code in the original is translated over.
+Use only unescaped single quotes inside of the code values for the UDF's, do not use escaped double quotes.
+Convert following the instructions and examples given. Here is the code:
+`
+
+export const MAPPING_PROMPT = `
+Here is an example of a mapping generated between the given example Python code and the Texera UDFs using their CELL and UDF IDs. Cell IDs are designated by the UUID following '# START'. The format should be kept the same.
+{
+"UDF1": [
+"CEll3",
+"CELL4"
+],
+"UDF2": [
+"CELL5"
+],
+"UDF3": [
+"CELL6",
+"CELL7"
+]
+"UDF4": [
+"CELL8"
+]
+}
+Now create a mapping for the UDFs and the original code. Link the code blocks marked by 'START <cell-uuid>' and 'END <cell-uuid>' with the UDF UUID's. The code between them should be equivalent. Multiple cells can be mapped to the same UDF if the code they contain are the same. There could be any number of cells and UDFs, so only create the correct number in the mapping. Only give the mapping.
+`;
diff --git a/core/gui/src/app/workspace/service/operator-debug/udf-debug.service.spec.ts b/frontend/src/app/workspace/service/operator-debug/udf-debug.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-debug/udf-debug.service.spec.ts
rename to frontend/src/app/workspace/service/operator-debug/udf-debug.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/operator-debug/udf-debug.service.ts b/frontend/src/app/workspace/service/operator-debug/udf-debug.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-debug/udf-debug.service.ts
rename to frontend/src/app/workspace/service/operator-debug/udf-debug.service.ts
diff --git a/core/gui/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts b/frontend/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts
rename to frontend/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/operator-menu/operator-menu.service.ts b/frontend/src/app/workspace/service/operator-menu/operator-menu.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-menu/operator-menu.service.ts
rename to frontend/src/app/workspace/service/operator-menu/operator-menu.service.ts
diff --git a/core/gui/src/app/workspace/service/operator-metadata/mock-operator-metadata.data.ts b/frontend/src/app/workspace/service/operator-metadata/mock-operator-metadata.data.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-metadata/mock-operator-metadata.data.ts
rename to frontend/src/app/workspace/service/operator-metadata/mock-operator-metadata.data.ts
diff --git a/core/gui/src/app/workspace/service/operator-metadata/operator-metadata.service.spec.ts b/frontend/src/app/workspace/service/operator-metadata/operator-metadata.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-metadata/operator-metadata.service.spec.ts
rename to frontend/src/app/workspace/service/operator-metadata/operator-metadata.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/operator-metadata/operator-metadata.service.ts b/frontend/src/app/workspace/service/operator-metadata/operator-metadata.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-metadata/operator-metadata.service.ts
rename to frontend/src/app/workspace/service/operator-metadata/operator-metadata.service.ts
diff --git a/core/gui/src/app/workspace/service/operator-metadata/stub-operator-metadata.service.ts b/frontend/src/app/workspace/service/operator-metadata/stub-operator-metadata.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/operator-metadata/stub-operator-metadata.service.ts
rename to frontend/src/app/workspace/service/operator-metadata/stub-operator-metadata.service.ts
diff --git a/core/gui/src/app/workspace/service/panel/panel.service.ts b/frontend/src/app/workspace/service/panel/panel.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/panel/panel.service.ts
rename to frontend/src/app/workspace/service/panel/panel.service.ts
diff --git a/core/gui/src/app/workspace/service/preset/preset.service.spec.ts b/frontend/src/app/workspace/service/preset/preset.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/preset/preset.service.spec.ts
rename to frontend/src/app/workspace/service/preset/preset.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/preset/preset.service.ts b/frontend/src/app/workspace/service/preset/preset.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/preset/preset.service.ts
rename to frontend/src/app/workspace/service/preset/preset.service.ts
diff --git a/core/gui/src/app/workspace/service/report-generation/report-generation.service.ts b/frontend/src/app/workspace/service/report-generation/report-generation.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/report-generation/report-generation.service.ts
rename to frontend/src/app/workspace/service/report-generation/report-generation.service.ts
diff --git a/core/gui/src/app/workspace/service/undo-redo/undo-redo.service.spec.ts b/frontend/src/app/workspace/service/undo-redo/undo-redo.service.spec.ts
similarity index 96%
rename from core/gui/src/app/workspace/service/undo-redo/undo-redo.service.spec.ts
rename to frontend/src/app/workspace/service/undo-redo/undo-redo.service.spec.ts
index 4555a9698c7..db43e729e60 100644
--- a/core/gui/src/app/workspace/service/undo-redo/undo-redo.service.spec.ts
+++ b/frontend/src/app/workspace/service/undo-redo/undo-redo.service.spec.ts
@@ -21,8 +21,8 @@ import { StubOperatorMetadataService } from "../operator-metadata/stub-operator-
 import { JointUIService } from "../joint-ui/joint-ui.service";
 import { OperatorMetadataService } from "../operator-metadata/operator-metadata.service";
 import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
-import { mockScanPredicate, mockResultPredicate, mockPoint } from "../workflow-graph/model/mock-workflow-data";
-import { TestBed, inject } from "@angular/core/testing";
+import { mockPoint, mockResultPredicate, mockScanPredicate } from "../workflow-graph/model/mock-workflow-data";
+import { inject, TestBed } from "@angular/core/testing";
 
 import { UndoRedoService } from "./undo-redo.service";
 import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.service";
diff --git a/core/gui/src/app/workspace/service/undo-redo/undo-redo.service.ts b/frontend/src/app/workspace/service/undo-redo/undo-redo.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/undo-redo/undo-redo.service.ts
rename to frontend/src/app/workspace/service/undo-redo/undo-redo.service.ts
diff --git a/core/gui/src/app/workspace/service/validation/validation-workflow.service.spec.ts b/frontend/src/app/workspace/service/validation/validation-workflow.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/validation/validation-workflow.service.spec.ts
rename to frontend/src/app/workspace/service/validation/validation-workflow.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/validation/validation-workflow.service.ts b/frontend/src/app/workspace/service/validation/validation-workflow.service.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/validation/validation-workflow.service.ts
rename to frontend/src/app/workspace/service/validation/validation-workflow.service.ts
index a30a2283d35..93099888b21 100644
--- a/core/gui/src/app/workspace/service/validation/validation-workflow.service.ts
+++ b/frontend/src/app/workspace/service/validation/validation-workflow.service.ts
@@ -25,8 +25,7 @@ import { WorkflowActionService } from "../workflow-graph/model/workflow-action.s
 import Ajv from "ajv";
 import { map } from "rxjs/operators";
 import { DynamicSchemaService } from "../dynamic-schema/dynamic-schema.service";
-import { untilDestroyed } from "@ngneat/until-destroy";
-import { UntilDestroy } from "@ngneat/until-destroy";
+import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { WorkflowGraph, WorkflowGraphReadonly } from "../workflow-graph/model/workflow-graph";
 
 export type ValidationError = {
@@ -135,13 +134,15 @@ export class ValidationWorkflowService {
   }
 
   private updateValidationState(operatorID: string, validation: Validation) {
-    this.operatorValidationStream.next({ validation, operatorID });
     if (!validation.isValid) {
       this.workflowErrors[operatorID] = validation;
     } else {
       delete this.workflowErrors[operatorID];
-      this.workflowValidationErrorStream.next({ errors: this.workflowErrors, workflowEmpty: this.workflowEmpty });
     }
+
+    // emit event to streams after updating workflowErrors to keep subscribers' view of the state consistent
+    this.operatorValidationStream.next({ validation, operatorID });
+    this.workflowValidationErrorStream.next({ errors: this.workflowErrors, workflowEmpty: this.workflowEmpty });
   }
 
   private checkIfWorkflowEmpty() {
diff --git a/core/gui/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts b/frontend/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts
similarity index 99%
rename from core/gui/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts
rename to frontend/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts
index 5bdf65d48b6..a1dbb0c97cb 100644
--- a/core/gui/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts
+++ b/frontend/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts
@@ -27,7 +27,6 @@ import {
   WorkflowComputingUnitResourceLimit,
   WorkflowComputingUnitType,
 } from "../../types/workflow-computing-unit";
-import { assert } from "../../../common/util/assert";
 import { map } from "rxjs/operators";
 
 export const COMPUTING_UNIT_BASE_URL = "computing-unit";
diff --git a/core/gui/src/app/workspace/service/workflow-console/workflow-console.service.spec.ts b/frontend/src/app/workspace/service/workflow-console/workflow-console.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-console/workflow-console.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-console/workflow-console.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-console/workflow-console.service.ts b/frontend/src/app/workspace/service/workflow-console/workflow-console.service.ts
similarity index 97%
rename from core/gui/src/app/workspace/service/workflow-console/workflow-console.service.ts
rename to frontend/src/app/workspace/service/workflow-console/workflow-console.service.ts
index 5a3899b1067..b7d60868aea 100644
--- a/core/gui/src/app/workspace/service/workflow-console/workflow-console.service.ts
+++ b/frontend/src/app/workspace/service/workflow-console/workflow-console.service.ts
@@ -20,8 +20,7 @@
 import { Injectable } from "@angular/core";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
 import { ConsoleMessage, ConsoleUpdateEvent } from "../../types/workflow-common.interface";
-import { Subject } from "rxjs";
-import { Observable } from "rxjs";
+import { Observable, Subject } from "rxjs";
 import { RingBuffer } from "ring-buffer-ts";
 import { ExecutionState } from "../../types/execute-workflow.interface";
 import { GuiConfigService } from "../../../common/service/gui-config.service";
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.spec.ts b/frontend/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.ts b/frontend/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/coeditor-presence.service.ts
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.spec.ts b/frontend/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.spec.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.ts b/frontend/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.ts
similarity index 97%
rename from core/gui/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.ts
index 9793792c9b2..2d32bb43cce 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/joint-graph-wrapper.ts
@@ -140,8 +140,6 @@ export class JointGraphWrapper {
   private workflowEditorZoomSubject: Subject<number> = new Subject<number>();
   // event stream of restoring zoom / offset default of the jointJS paper
   private restorePaperOffsetSubject: Subject<void> = new Subject<void>();
-  // event stream to toggle the jointPaper grids on or off.
-  private jointPaperGridsToggleStream = new Subject<void>();
 
   // event stream of showing the breakpoint button of a link
   private jointLinkBreakpointShowStream = new Subject<linkIDType>();
@@ -587,16 +585,19 @@ export class JointGraphWrapper {
   }
 
   public autoLayoutJoint(): void {
-    joint.layout.DirectedGraph.layout(this.jointGraph, {
-      dagre: dagre,
-      graphlib: graphlib,
-      nodeSep: 100,
-      edgeSep: 150,
-      rankSep: 80,
-      ranker: "tight-tree",
-      rankDir: "LR",
-      resizeClusters: true,
-    });
+    joint.layout.DirectedGraph.layout(
+      [...this.jointGraph.getElements().filter(el => el.attributes.type !== "region"), ...this.jointGraph.getLinks()],
+      {
+        dagre: dagre,
+        graphlib: graphlib,
+        nodeSep: 100,
+        edgeSep: 150,
+        rankSep: 80,
+        ranker: "tight-tree",
+        rankDir: "LR",
+        resizeClusters: true,
+      }
+    );
   }
 
   /**
@@ -884,20 +885,6 @@ export class JointGraphWrapper {
     return JointGraphContext;
   }
 
-  /**
-   * Returns an observable to indicate a toggle of grids has happened, and lets workflow editor to handle the state.
-   */
-  public getJointPaperGridsToggleStream(): Observable<void> {
-    return this.jointPaperGridsToggleStream.asObservable();
-  }
-
-  /**
-   * Triggers a toggle of whether to show grids in jointPaper.
-   */
-  public toggleGrids() {
-    this.jointPaperGridsToggleStream.next();
-  }
-
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   //                                     Below are methods for coeditor-presence.                                     //
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/mock-workflow-data.ts b/frontend/src/app/workspace/service/workflow-graph/model/mock-workflow-data.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/mock-workflow-data.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/mock-workflow-data.ts
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/shared-model-change-handler.ts b/frontend/src/app/workspace/service/workflow-graph/model/shared-model-change-handler.ts
similarity index 91%
rename from core/gui/src/app/workspace/service/workflow-graph/model/shared-model-change-handler.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/shared-model-change-handler.ts
index 4ad5bda5c8d..e5eab7a812e 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/shared-model-change-handler.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/shared-model-change-handler.ts
@@ -153,9 +153,12 @@ export class SharedModelChangeHandler {
       event.changes.keys.forEach((change, key) => {
         if (change.action === "add") {
           const newLink = this.texeraGraph.sharedModel.operatorLinkMap.get(key) as OperatorLink;
-          const jointLinkCell = JointUIService.getJointLinkCell(newLink);
-          jointElementsToAdd.push(jointLinkCell);
-          linksToAdd.push(newLink);
+          // Validate the link first
+          if (this.validateAndRepairNewLink(newLink)) {
+            const jointLinkCell = JointUIService.getJointLinkCell(newLink);
+            jointElementsToAdd.push(jointLinkCell);
+            linksToAdd.push(newLink);
+          }
         }
         if (change.action === "delete") {
           keysToDelete.push(key);
@@ -200,6 +203,33 @@ export class SharedModelChangeHandler {
     });
   }
 
+  /**
+   * Check the sanity of a newly added link. We have constraints on a new link (it should connect to operators and
+   * ports that exist, and it should not be duplicated with another link connecting to the same operator ports.) Such
+   * constraints are enforced if the change to the shared model comes from local UI (`WorkflowGraph.addLink()`). If
+   * the change is initiated by the `UndoManager` or from remote collaborators, however, due to the limitations of Yjs,
+   * it is not possible to check the sanity of this operation before it is applied to the shared model. To ensure the
+   * integrity of the shared model, we validate the link add operation here instead, and repair the shared model if it
+   * violates the constraints.
+   * @param newLink A new link that has already been added to the shared model
+   * @returns Whether this new link passes the sanity check. If it does, this change can be applied to the UI. Otherwise
+   *          this link is already deleted from the shared model.
+   */
+  private validateAndRepairNewLink(newLink: OperatorLink): boolean {
+    try {
+      this.texeraGraph.assertLinkNotDuplicated(newLink);
+      // Verify the link connects to operators and ports that exist.
+      this.texeraGraph.assertLinkIsValid(newLink);
+      return true;
+    } catch (error) {
+      // Invalid link, repair the shared model
+      this.texeraGraph.sharedModel.operatorLinkMap.delete(newLink.linkID);
+      // This is treated as a normal repair step and not an error.
+      console.log("failed to add link. cause: ", (error as Error).message);
+      return false;
+    }
+  }
+
   /**
    * Syncs element positions. Will temporarily block local updates.
    * @private
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/shared-model.ts b/frontend/src/app/workspace/service/workflow-graph/model/shared-model.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/shared-model.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/shared-model.ts
index 4a74bbd0efe..0974426bcf5 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/shared-model.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/shared-model.ts
@@ -21,11 +21,11 @@ import * as Y from "yjs";
 import { WebsocketProvider } from "y-websocket";
 import { Awareness } from "y-protocols/awareness";
 import {
+  BreakpointInfo,
   CommentBox,
   OperatorLink,
   OperatorPredicate,
   Point,
-  BreakpointInfo,
 } from "../../../types/workflow-common.interface";
 import { CoeditorState, User } from "../../../../common/type/user";
 import { getWebsocketUrl } from "../../../../common/util/url";
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/sync-texera-model.spec.ts b/frontend/src/app/workspace/service/workflow-graph/model/sync-texera-model.spec.ts
similarity index 99%
rename from core/gui/src/app/workspace/service/workflow-graph/model/sync-texera-model.spec.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/sync-texera-model.spec.ts
index d1f4c0cbe46..ecaaeb4dc62 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/sync-texera-model.spec.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/sync-texera-model.spec.ts
@@ -36,7 +36,6 @@ import { JointUIService } from "../../joint-ui/joint-ui.service";
 import { WorkflowUtilService } from "../util/workflow-util.service";
 import { StubOperatorMetadataService } from "../../operator-metadata/stub-operator-metadata.service";
 import { OperatorMetadataService } from "../../operator-metadata/operator-metadata.service";
-import { OperatorPredicate, Point } from "../../../types/workflow-common.interface";
 import { commonTestProviders } from "../../../../common/testing/test-utils";
 
 describe("SyncTexeraModel", () => {
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/sync-texera-model.ts b/frontend/src/app/workspace/service/workflow-graph/model/sync-texera-model.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/sync-texera-model.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/sync-texera-model.ts
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-action.service.spec.ts b/frontend/src/app/workspace/service/workflow-graph/model/workflow-action.service.spec.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/workflow-graph/model/workflow-action.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/workflow-action.service.spec.ts
index db9fc5011e4..4ddf3b90068 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-action.service.spec.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/workflow-action.service.spec.ts
@@ -23,24 +23,22 @@ import { JointUIService } from "./../../joint-ui/joint-ui.service";
 import { WorkflowGraph } from "./workflow-graph";
 import { UndoRedoService } from "./../../undo-redo/undo-redo.service";
 import {
-  mockScanPredicate,
+  mockCommentBox,
+  mockFalseResultSentimentLink,
+  mockFalseSentimentScanLink,
+  mockPoint,
   mockResultPredicate,
-  mockSentimentPredicate,
+  mockScanPredicate,
   mockScanResultLink,
   mockScanSentimentLink,
+  mockSentimentPredicate,
   mockSentimentResultLink,
-  mockFalseResultSentimentLink,
-  mockFalseSentimentScanLink,
-  mockPoint,
-  mockCommentBox,
 } from "./mock-workflow-data";
-import { TestBed, inject } from "@angular/core/testing";
+import { inject, TestBed } from "@angular/core/testing";
 
 import { WorkflowActionService } from "./workflow-action.service";
-import { OperatorPredicate, Point } from "../../../types/workflow-common.interface";
-import { g } from "jointjs";
+import { OperatorPredicate } from "../../../types/workflow-common.interface";
 import { WorkflowUtilService } from "../util/workflow-util.service";
-import { join } from "lodash";
 import { commonTestProviders } from "../../../../common/testing/test-utils";
 
 describe("WorkflowActionService", () => {
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-action.service.ts b/frontend/src/app/workspace/service/workflow-graph/model/workflow-action.service.ts
similarity index 99%
rename from core/gui/src/app/workspace/service/workflow-graph/model/workflow-action.service.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/workflow-action.service.ts
index 4ed8144e5b1..ddee22465aa 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-action.service.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/workflow-action.service.ts
@@ -26,8 +26,8 @@ import { WorkflowMetadata } from "../../../../dashboard/type/workflow-metadata.i
 import {
   Comment,
   CommentBox,
-  OperatorLink,
   LogicalPort,
+  OperatorLink,
   OperatorPredicate,
   Point,
   PortDescription,
@@ -43,7 +43,6 @@ import { filter } from "rxjs/operators";
 import { isDefined } from "../../../../common/util/predicate";
 import { User } from "../../../../common/type/user";
 import { SharedModelChangeHandler } from "./shared-model-change-handler";
-import { ValidationWorkflowService } from "../../validation/validation-workflow.service";
 import { GuiConfigService } from "../../../../common/service/gui-config.service";
 
 export const DEFAULT_WORKFLOW_NAME = "Untitled Workflow";
@@ -250,7 +249,7 @@ export class WorkflowActionService {
 
     const port: PortDescription = {
       portID,
-      displayName: portID,
+      displayName: "",
       allowMultiInputs,
       isDynamicPort: true,
       dependencies: [],
@@ -637,6 +636,8 @@ export class WorkflowActionService {
         .getAllCommentBoxes()
         .forEach(commentBox => this.deleteCommentBox(commentBox.commentBoxID));
 
+      this.jointGraphWrapper.jointGraph.clear();
+
       if (workflow === undefined) {
         this.setNewSharedModel();
         return;
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-graph.spec.ts b/frontend/src/app/workspace/service/workflow-graph/model/workflow-graph.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-graph/model/workflow-graph.spec.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/workflow-graph.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-graph.ts b/frontend/src/app/workspace/service/workflow-graph/model/workflow-graph.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/workflow-graph/model/workflow-graph.ts
rename to frontend/src/app/workspace/service/workflow-graph/model/workflow-graph.ts
index 8a3ff7a51c5..4d4bb93edeb 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/model/workflow-graph.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/model/workflow-graph.ts
@@ -19,6 +19,7 @@
 
 import { Observable, Subject } from "rxjs";
 import {
+  BreakpointInfo,
   Comment,
   CommentBox,
   LogicalPort,
@@ -27,7 +28,6 @@ import {
   PartitionInfo,
   PortDescription,
   PortProperty,
-  BreakpointInfo,
 } from "../../../types/workflow-common.interface";
 import { isEqual } from "lodash-es";
 import { SharedModel } from "./shared-model";
@@ -35,7 +35,6 @@ import { CoeditorState, User } from "../../../../common/type/user";
 import { createYTypeFromObject, updateYTypeFromObject, YType } from "../../../types/shared-editing.interface";
 import { Awareness } from "y-protocols/awareness";
 import * as Y from "yjs";
-import { isDefined } from "../../../../common/util/predicate";
 
 // define the restricted methods that could change the graph
 type restrictedMethods =
@@ -1111,6 +1110,19 @@ export class WorkflowGraph {
     }
   }
 
+  /**
+   * Checks if a link is unique in the graph. Throws an error if more than one link with the same source and target
+   * as the given link exists.
+   */
+  public assertLinkNotDuplicated(link: OperatorLink): void {
+    const links = this.getAllLinks().filter(
+      value => isEqual(value.source, link.source) && isEqual(value.target, link.target)
+    );
+    if (links.length > 1) {
+      throw new Error(`duplicate link found with same source and target as link ${link}`);
+    }
+  }
+
   /**
    * Retrieves a subgraph (subDAG) from the workflow graph. This method excludes disabled operators and links.
    *
diff --git a/core/gui/src/app/workspace/service/workflow-graph/util/workflow-util.service.spec.ts b/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.spec.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/workflow-graph/util/workflow-util.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.spec.ts
index c1e05db835a..93e1566e222 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/util/workflow-util.service.spec.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.spec.ts
@@ -19,7 +19,7 @@
 
 import { StubOperatorMetadataService } from "./../../operator-metadata/stub-operator-metadata.service";
 import { OperatorMetadataService } from "./../../operator-metadata/operator-metadata.service";
-import { TestBed, inject } from "@angular/core/testing";
+import { inject, TestBed } from "@angular/core/testing";
 
 import { WorkflowUtilService } from "./workflow-util.service";
 import { mockScanSourceSchema } from "../../operator-metadata/mock-operator-metadata.data";
diff --git a/core/gui/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts b/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts
similarity index 94%
rename from core/gui/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts
rename to frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts
index a727d47d5f4..8bca014062a 100644
--- a/core/gui/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts
+++ b/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts
@@ -18,9 +18,9 @@
  */
 
 import {
-  OperatorPredicate,
-  CommentBox,
   Comment,
+  CommentBox,
+  OperatorPredicate,
   Point,
   PortDescription,
 } from "../../../types/workflow-common.interface";
@@ -59,6 +59,13 @@ export class WorkflowUtilService {
     return this.operatorSchemaListCreatedSubject.asObservable();
   }
 
+  /**
+   * Returns a list of all available operator types
+   */
+  public getOperatorTypeList(): string[] {
+    return this.operatorSchemaList.map(schema => schema.operatorType);
+  }
+
   /**
    * Generates a new UUID for operator
    */
@@ -106,7 +113,7 @@ export class WorkflowUtilService {
    * @param operatorType type of an Operator
    * @returns a new OperatorPredicate of the operatorType
    */
-  public getNewOperatorPredicate(operatorType: string): OperatorPredicate {
+  public getNewOperatorPredicate(operatorType: string, customDisplayName?: string): OperatorPredicate {
     const operatorSchema = this.operatorSchemaList.find(schema => schema.operatorType === operatorType);
     if (operatorSchema === undefined) {
       throw new Error(`operatorType ${operatorType} doesn't exist in operator metadata`);
@@ -131,8 +138,8 @@ export class WorkflowUtilService {
     // by default, the operator is not disabled
     const isDisabled = false;
 
-    // by default, the operator name is the user friendly name
-    const customDisplayName = operatorSchema.additionalMetadata.userFriendlyName;
+    // Use provided customDisplayName or default to the user friendly name from schema
+    const displayName = customDisplayName ?? operatorSchema.additionalMetadata.userFriendlyName;
 
     const dynamicInputPorts = operatorSchema.additionalMetadata.dynamicInputPorts ?? false;
     const dynamicOutputPorts = operatorSchema.additionalMetadata.dynamicOutputPorts ?? false;
@@ -160,7 +167,7 @@ export class WorkflowUtilService {
       outputPorts,
       showAdvanced,
       isDisabled,
-      customDisplayName,
+      customDisplayName: displayName,
       dynamicInputPorts,
       dynamicOutputPorts,
     };
diff --git a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts b/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts
similarity index 79%
rename from core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts
index 7e45c34de2a..6bf37102b3a 100644
--- a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts
+++ b/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts
@@ -17,24 +17,18 @@
  * under the License.
  */
 
-import { TestBed, fakeAsync, tick } from "@angular/core/testing";
+import { TestBed } from "@angular/core/testing";
 import { WorkflowResultExportService } from "./workflow-result-export.service";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
 import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
 import { NotificationService } from "../../../common/service/notification/notification.service";
 import { ExecuteWorkflowService } from "../execute-workflow/execute-workflow.service";
-import {
-  WorkflowResultService,
-  OperatorPaginationResultService,
-  OperatorResultService,
-} from "../workflow-result/workflow-result.service";
-import { FileSaverService } from "../../../dashboard/service/user/file/file-saver.service";
-import { of, EMPTY } from "rxjs";
-import { PaginatedResultEvent } from "../../types/workflow-websocket.interface";
+import { WorkflowResultService } from "../workflow-result/workflow-result.service";
+import { of } from "rxjs";
 import { ExecutionState } from "../../types/execute-workflow.interface";
-import * as JSZip from "jszip";
 import { DownloadService } from "src/app/dashboard/service/user/download/download.service";
+import { DatasetService } from "../../../dashboard/service/user/dataset/dataset.service";
 import { commonTestProviders } from "../../../common/testing/test-utils";
 
 describe("WorkflowResultExportService", () => {
@@ -45,6 +39,7 @@ describe("WorkflowResultExportService", () => {
   let executeWorkflowServiceSpy: jasmine.SpyObj<ExecuteWorkflowService>;
   let workflowResultServiceSpy: jasmine.SpyObj<WorkflowResultService>;
   let downloadServiceSpy: jasmine.SpyObj<DownloadService>;
+  let datasetServiceSpy: jasmine.SpyObj<DatasetService>;
 
   let jointGraphWrapperSpy: jasmine.SpyObj<any>;
   let texeraGraphSpy: jasmine.SpyObj<any>;
@@ -60,8 +55,24 @@ describe("WorkflowResultExportService", () => {
     jointGraphWrapperSpy.getJointOperatorHighlightStream.and.returnValue(of());
     jointGraphWrapperSpy.getJointOperatorUnhighlightStream.and.returnValue(of());
 
-    texeraGraphSpy = jasmine.createSpyObj("TexeraGraph", ["getAllOperators"]);
+    texeraGraphSpy = jasmine.createSpyObj("TexeraGraph", [
+      "getAllOperators",
+      "getOperatorAddStream",
+      "getOperatorDeleteStream",
+      "getOperatorPropertyChangeStream",
+      "getLinkAddStream",
+      "getLinkDeleteStream",
+      "getDisabledOperatorsChangedStream",
+      "getAllLinks",
+    ]);
     texeraGraphSpy.getAllOperators.and.returnValue([]);
+    texeraGraphSpy.getOperatorAddStream.and.returnValue(of());
+    texeraGraphSpy.getOperatorDeleteStream.and.returnValue(of());
+    texeraGraphSpy.getOperatorPropertyChangeStream.and.returnValue(of());
+    texeraGraphSpy.getLinkAddStream.and.returnValue(of());
+    texeraGraphSpy.getLinkDeleteStream.and.returnValue(of());
+    texeraGraphSpy.getDisabledOperatorsChangedStream.and.returnValue(of());
+    texeraGraphSpy.getAllLinks.and.returnValue([]);
 
     const wsSpy = jasmine.createSpyObj("WorkflowWebsocketService", ["subscribeToEvent", "send"]);
     wsSpy.subscribeToEvent.and.returnValue(of()); // Return an empty observable
@@ -87,6 +98,9 @@ describe("WorkflowResultExportService", () => {
     const downloadSpy = jasmine.createSpyObj("DownloadService", ["downloadOperatorsResult"]);
     downloadSpy.downloadOperatorsResult.and.returnValue(of(new Blob()));
 
+    const datasetSpy = jasmine.createSpyObj("DatasetService", ["retrieveAccessibleDatasets"]);
+    datasetSpy.retrieveAccessibleDatasets.and.returnValue(of([]));
+
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
       providers: [
@@ -97,6 +111,7 @@ describe("WorkflowResultExportService", () => {
         { provide: ExecuteWorkflowService, useValue: ewSpy },
         { provide: WorkflowResultService, useValue: wrSpy },
         { provide: DownloadService, useValue: downloadSpy },
+        { provide: DatasetService, useValue: datasetSpy },
         ...commonTestProviders,
       ],
     });
@@ -109,6 +124,7 @@ describe("WorkflowResultExportService", () => {
     executeWorkflowServiceSpy = TestBed.inject(ExecuteWorkflowService) as jasmine.SpyObj<ExecuteWorkflowService>;
     workflowResultServiceSpy = TestBed.inject(WorkflowResultService) as jasmine.SpyObj<WorkflowResultService>;
     downloadServiceSpy = TestBed.inject(DownloadService) as jasmine.SpyObj<DownloadService>;
+    datasetServiceSpy = TestBed.inject(DatasetService) as jasmine.SpyObj<DatasetService>;
   });
 
   it("should be created", () => {
diff --git a/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts b/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts
new file mode 100644
index 00000000000..3fde39774f5
--- /dev/null
+++ b/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts
@@ -0,0 +1,363 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Injectable } from "@angular/core";
+import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
+import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
+import { BehaviorSubject, merge, Observable, of } from "rxjs";
+import { NotificationService } from "../../../common/service/notification/notification.service";
+import { ExecuteWorkflowService } from "../execute-workflow/execute-workflow.service";
+import { ExecutionState, isNotInExecution } from "../../types/execute-workflow.interface";
+import { catchError, filter, map, take } from "rxjs/operators";
+import { WorkflowResultService } from "../workflow-result/workflow-result.service";
+import { DownloadService, ExportWorkflowJsonResponse } from "../../../dashboard/service/user/download/download.service";
+import { HttpResponse } from "@angular/common/http";
+import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit";
+import { GuiConfigService } from "../../../common/service/gui-config.service";
+
+/**
+ * Result of workflow result downloadability analysis.
+ * Contains information about which operators are restricted from exporting
+ * due to non-downloadable dataset dependencies.
+ */
+export class WorkflowResultDownloadability {
+  /**
+   * Map of operator IDs to sets of blocking dataset labels.
+   * Key: Operator ID
+   * Value: Set of human-readable dataset labels (e.g., "dataset_name (owner@email.com)")
+   *        that are blocking this operator from being exported
+   *
+   * An operator appears in this map if it directly uses or depends on (through data flow)
+   * one or more datasets that the current user is not allowed to download.
+   */
+  restrictedOperatorMap: Map<string, Set<string>>;
+
+  constructor(restrictedOperatorMap: Map<string, Set<string>>) {
+    this.restrictedOperatorMap = restrictedOperatorMap;
+  }
+
+  /**
+   * Filters operator IDs to return only those that are not restricted by dataset access controls.
+   *
+   * @param operatorIds Array of operator IDs to filter
+   * @returns Array of operator IDs that can be exported
+   */
+  getExportableOperatorIds(operatorIds: readonly string[]): string[] {
+    return operatorIds.filter(operatorId => !this.restrictedOperatorMap.has(operatorId));
+  }
+
+  /**
+   * Filters operator IDs to return only those that are restricted by dataset access controls.
+   *
+   * @param operatorIds Array of operator IDs to filter
+   * @returns Array of operator IDs that are blocked from export
+   */
+  getBlockedOperatorIds(operatorIds: readonly string[]): string[] {
+    return operatorIds.filter(operatorId => this.restrictedOperatorMap.has(operatorId));
+  }
+
+  /**
+   * Gets the list of dataset labels that are blocking export for the given operators.
+   * Used to display user-friendly error messages about which datasets are causing restrictions.
+   *
+   * @param operatorIds Array of operator IDs to check
+   * @returns Array of dataset labels (e.g., "Dataset1 (user@example.com)")
+   */
+  getBlockingDatasets(operatorIds: readonly string[]): string[] {
+    const labels = new Set<string>();
+    operatorIds.forEach(operatorId => {
+      const datasets = this.restrictedOperatorMap.get(operatorId);
+      datasets?.forEach(label => labels.add(label));
+    });
+    return Array.from(labels);
+  }
+}
+
+@Injectable({
+  providedIn: "root",
+})
+export class WorkflowResultExportService {
+  hasResultToExportOnHighlightedOperators: boolean = false;
+  hasResultToExportOnAllOperators = new BehaviorSubject<boolean>(false);
+  constructor(
+    private workflowWebsocketService: WorkflowWebsocketService,
+    private workflowActionService: WorkflowActionService,
+    private notificationService: NotificationService,
+    private executeWorkflowService: ExecuteWorkflowService,
+    private workflowResultService: WorkflowResultService,
+    private downloadService: DownloadService,
+    private config: GuiConfigService
+  ) {
+    this.registerResultToExportUpdateHandler();
+  }
+
+  registerResultToExportUpdateHandler() {
+    merge(
+      this.executeWorkflowService
+        .getExecutionStateStream()
+        .pipe(filter(({ previous, current }) => current.state === ExecutionState.Completed)),
+      this.workflowActionService.getJointGraphWrapper().getJointOperatorHighlightStream(),
+      this.workflowActionService.getJointGraphWrapper().getJointOperatorUnhighlightStream()
+    ).subscribe(() => {
+      this.updateExportAvailabilityFlags();
+    });
+  }
+
+  /**
+   * Computes restriction analysis by calling the backend API.
+   *
+   * The backend analyzes the workflow to identify operators that are restricted from export
+   * due to non-downloadable dataset dependencies. The restriction propagates through the
+   * workflow graph via data flow.
+   *
+   * @returns Observable that emits the restriction analysis result
+   */
+  public computeRestrictionAnalysis(): Observable<WorkflowResultDownloadability> {
+    const workflowId = this.workflowActionService.getWorkflow().wid;
+    if (!workflowId) {
+      return of(new WorkflowResultDownloadability(new Map<string, Set<string>>()));
+    }
+
+    return this.downloadService.getWorkflowResultDownloadability(workflowId).pipe(
+      map(backendResponse => {
+        // Convert backend format to Map<operatorId, Set<datasetLabel>>
+        const restrictedOperatorMap = new Map<string, Set<string>>();
+        Object.entries(backendResponse).forEach(([operatorId, datasetLabels]) => {
+          restrictedOperatorMap.set(operatorId, new Set(datasetLabels));
+        });
+        return new WorkflowResultDownloadability(restrictedOperatorMap);
+      }),
+      catchError(() => {
+        return of(new WorkflowResultDownloadability(new Map<string, Set<string>>()));
+      })
+    );
+  }
+
+  /**
+   * Updates UI flags that control export button visibility and availability.
+   *
+   * Checks execution state and result availability to determine:
+   * - hasResultToExportOnHighlightedOperators: for context menu export button
+   * - hasResultToExportOnAllOperators: for top menu export button
+   *
+   * Export is only available when execution is idle and operators have results.
+   */
+  private updateExportAvailabilityFlags(): void {
+    const executionIdle = isNotInExecution(this.executeWorkflowService.getExecutionState().state);
+
+    const highlightedOperators = this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs();
+
+    const highlightedHasResult = highlightedOperators.some(
+      operatorId =>
+        this.workflowResultService.hasAnyResult(operatorId) ||
+        this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined
+    );
+
+    this.hasResultToExportOnHighlightedOperators = executionIdle && highlightedHasResult;
+
+    const allOperatorIds = this.workflowActionService
+      .getTexeraGraph()
+      .getAllOperators()
+      .map(operator => operator.operatorID);
+
+    const hasAnyResult =
+      executionIdle &&
+      allOperatorIds.some(
+        operatorId =>
+          this.workflowResultService.hasAnyResult(operatorId) ||
+          this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined
+      );
+
+    this.hasResultToExportOnAllOperators.next(hasAnyResult);
+  }
+
+  /**
+   * export the workflow execution result according the export type
+   */
+  exportWorkflowExecutionResult(
+    exportType: string,
+    workflowName: string,
+    datasetIds: number[],
+    rowIndex: number,
+    columnIndex: number,
+    filename: string,
+    exportAll: boolean = false, // if the user click export button on the top bar (a.k.a menu),
+    // we should export all operators, otherwise, only highlighted ones
+    // which means export button is selected from context-menu
+    destination: "dataset" | "local" = "dataset", // default to dataset
+    unit: DashboardWorkflowComputingUnit | null // computing unit for cluster setting
+  ): void {
+    this.computeRestrictionAnalysis()
+      .pipe(take(1))
+      .subscribe(restrictionResult =>
+        this.performExport(
+          exportType,
+          workflowName,
+          datasetIds,
+          rowIndex,
+          columnIndex,
+          filename,
+          exportAll,
+          destination,
+          unit,
+          restrictionResult
+        )
+      );
+  }
+
+  /**
+   * Performs the actual export operation with restriction validation.
+   *
+   * This method handles the core export logic:
+   * 1. Validates configuration and computing unit availability
+   * 2. Determines operator scope (all vs highlighted)
+   * 3. Applies restriction filtering with user feedback
+   * 4. Makes the export API call
+   * 5. Handles response and shows appropriate notifications
+   *
+   * Shows error messages if all operators are blocked, warning messages if some are blocked.
+   *
+   * @param downloadability Downloadability analysis result containing restriction information
+   */
+  private performExport(
+    exportType: string,
+    workflowName: string,
+    datasetIds: number[],
+    rowIndex: number,
+    columnIndex: number,
+    filename: string,
+    exportAll: boolean,
+    destination: "dataset" | "local",
+    unit: DashboardWorkflowComputingUnit | null,
+    downloadability: WorkflowResultDownloadability
+  ): void {
+    // Validates configuration and computing unit availability
+    if (!this.config.env.exportExecutionResultEnabled) {
+      return;
+    }
+    if (unit === null) {
+      this.notificationService.error("Cannot export result: computing unit is not available");
+      return;
+    }
+
+    const workflowId = this.workflowActionService.getWorkflow().wid;
+    if (!workflowId) {
+      this.notificationService.error("Cannot export result: workflow ID is not available");
+      return;
+    }
+
+    // Determines operator scope
+    const operatorIds = exportAll
+      ? this.workflowActionService
+          .getTexeraGraph()
+          .getAllOperators()
+          .map(operator => operator.operatorID)
+      : [...this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs()];
+
+    if (operatorIds.length === 0) {
+      return;
+    }
+
+    // Applies restriction filtering with user feedback
+    const exportableOperatorIds = downloadability.getExportableOperatorIds(operatorIds);
+
+    if (exportableOperatorIds.length === 0) {
+      const datasets = downloadability.getBlockingDatasets(operatorIds);
+      const suffix = datasets.length > 0 ? `: ${datasets.join(", ")}` : "";
+      this.notificationService.error(
+        `Cannot export result: selection depends on dataset(s) that are not downloadable${suffix}`
+      );
+      return;
+    }
+
+    if (exportableOperatorIds.length < operatorIds.length) {
+      const datasets = downloadability.getBlockingDatasets(operatorIds);
+      const suffix = datasets.length > 0 ? ` (${datasets.join(", ")})` : "";
+      this.notificationService.warning(
+        `Some operators were skipped because their results depend on dataset(s) that are not downloadable${suffix}`
+      );
+    }
+
+    const operatorArray = exportableOperatorIds.map(operatorId => ({
+      id: operatorId,
+      outputType: this.workflowResultService.determineOutputExtension(operatorId, exportType),
+    }));
+
+    // show loading
+    this.notificationService.loading("Exporting...");
+
+    // Make request
+    if (destination === "local") {
+      // Dataset export to local filesystem (download handled by browser)
+      this.downloadService.exportWorkflowResultToLocal(
+        exportType,
+        workflowId,
+        workflowName,
+        operatorArray,
+        rowIndex,
+        columnIndex,
+        filename,
+        unit
+      );
+    } else {
+      // Dataset export to dataset via API call
+      this.downloadService
+        .exportWorkflowResultToDataset(
+          exportType,
+          workflowId,
+          workflowName,
+          operatorArray,
+          [...datasetIds],
+          rowIndex,
+          columnIndex,
+          filename,
+          unit
+        )
+        .subscribe({
+          next: response => {
+            // "dataset" => response is JSON
+            // The server should return a JSON with {status, message}
+            const jsonResponse = response as HttpResponse<ExportWorkflowJsonResponse>;
+            const responseBody = jsonResponse.body;
+            if (responseBody && responseBody.status === "success") {
+              this.notificationService.success("Result exported successfully");
+            } else {
+              this.notificationService.error(responseBody?.message || "An error occurred during export");
+            }
+          },
+          error: (err: unknown) => {
+            const errorMessage = (err as any)?.error?.message || (err as any)?.error || err;
+            this.notificationService.error(`An error happened in exporting operator results: ${errorMessage}`);
+          },
+        });
+    }
+  }
+
+  /**
+   * Reset flags if the user leave workspace
+   */
+  public resetFlags(): void {
+    this.hasResultToExportOnHighlightedOperators = false;
+    this.hasResultToExportOnAllOperators = new BehaviorSubject<boolean>(false);
+  }
+
+  getExportOnAllOperatorsStatusStream(): Observable<boolean> {
+    return this.hasResultToExportOnAllOperators.asObservable();
+  }
+}
diff --git a/core/gui/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.spec.ts b/frontend/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.ts b/frontend/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.ts
rename to frontend/src/app/workspace/service/workflow-result/panel-resize/panel-resize.service.ts
diff --git a/core/gui/src/app/workspace/service/workflow-result/workflow-result.service.spec.ts b/frontend/src/app/workspace/service/workflow-result/workflow-result.service.spec.ts
similarity index 98%
rename from core/gui/src/app/workspace/service/workflow-result/workflow-result.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-result/workflow-result.service.spec.ts
index dc14ff574ce..13cdde3f2d9 100644
--- a/core/gui/src/app/workspace/service/workflow-result/workflow-result.service.spec.ts
+++ b/frontend/src/app/workspace/service/workflow-result/workflow-result.service.spec.ts
@@ -18,7 +18,7 @@
  */
 
 import { TestBed } from "@angular/core/testing";
-import { WorkflowResultService, OperatorPaginationResultService } from "./workflow-result.service";
+import { OperatorPaginationResultService, WorkflowResultService } from "./workflow-result.service";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
 import { of, Subject } from "rxjs";
 import { SchemaAttribute } from "../../types/workflow-compiling.interface";
diff --git a/core/gui/src/app/workspace/service/workflow-result/workflow-result.service.ts b/frontend/src/app/workspace/service/workflow-result/workflow-result.service.ts
similarity index 95%
rename from core/gui/src/app/workspace/service/workflow-result/workflow-result.service.ts
rename to frontend/src/app/workspace/service/workflow-result/workflow-result.service.ts
index eb687b118ef..96937ccbece 100644
--- a/core/gui/src/app/workspace/service/workflow-result/workflow-result.service.ts
+++ b/frontend/src/app/workspace/service/workflow-result/workflow-result.service.ts
@@ -24,12 +24,12 @@ import {
   WebDataUpdate,
   WebPaginationUpdate,
   WebResultUpdate,
-  WorkflowResultUpdate,
   WorkflowResultTableStats,
+  WorkflowResultUpdate,
 } from "../../types/execute-workflow.interface";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
 import { PaginatedResultEvent, WorkflowAvailableResultEvent } from "../../types/workflow-websocket.interface";
-import { map, Observable, of, pairwise, ReplaySubject, startWith, Subject, BehaviorSubject } from "rxjs";
+import { BehaviorSubject, map, Observable, of, pairwise, ReplaySubject, Subject } from "rxjs";
 import { v4 as uuid } from "uuid";
 import { IndexableObject } from "../../types/result-table.interface";
 import { isDefined } from "../../../common/util/predicate";
@@ -312,11 +312,18 @@ export class OperatorPaginationResultService {
     );
   }
 
-  public selectPage(pageIndex: number, pageSize: number): Observable<PaginatedResultEvent> {
+  public selectPage(
+    pageIndex: number,
+    pageSize: number,
+    columnOffset: number = 0,
+    columnLimit: number = Number.MAX_SAFE_INTEGER,
+    columnSearch: string = ""
+  ): Observable<PaginatedResultEvent> {
     // update currently selected page
     this.currentPageIndex = pageIndex;
     // first fetch from frontend result cache
-    const pageCache = this.resultCache.get(pageIndex);
+    const useCache = columnOffset === 0 && columnLimit === Number.MAX_SAFE_INTEGER && columnSearch === "";
+    const pageCache = useCache ? this.resultCache.get(pageIndex) : undefined;
     if (pageCache) {
       return of(<PaginatedResultEvent>{
         requestID: "",
@@ -334,6 +341,9 @@ export class OperatorPaginationResultService {
         operatorID,
         pageIndex,
         pageSize,
+        columnOffset,
+        columnLimit,
+        columnSearch,
       });
       const pendingRequestSubject = new Subject<PaginatedResultEvent>();
       this.pendingRequests.set(requestID, pendingRequestSubject);
diff --git a/core/gui/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.spec.ts b/frontend/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.ts b/frontend/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.ts
similarity index 99%
rename from core/gui/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.ts
rename to frontend/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.ts
index b572b9a87d7..05d2b1d2325 100644
--- a/core/gui/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.ts
+++ b/frontend/src/app/workspace/service/workflow-status/operator-reuse-cache-status.service.ts
@@ -21,6 +21,7 @@ import { Injectable } from "@angular/core";
 import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service";
 import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service";
 import { JointUIService } from "../joint-ui/joint-ui.service";
+
 @Injectable({
   providedIn: "root",
 })
diff --git a/core/gui/src/app/workspace/service/workflow-status/workflow-status.service.ts b/frontend/src/app/workspace/service/workflow-status/workflow-status.service.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-status/workflow-status.service.ts
rename to frontend/src/app/workspace/service/workflow-status/workflow-status.service.ts
diff --git a/core/gui/src/app/workspace/service/workflow-websocket/workflow-websocket.service.spec.ts b/frontend/src/app/workspace/service/workflow-websocket/workflow-websocket.service.spec.ts
similarity index 100%
rename from core/gui/src/app/workspace/service/workflow-websocket/workflow-websocket.service.spec.ts
rename to frontend/src/app/workspace/service/workflow-websocket/workflow-websocket.service.spec.ts
diff --git a/core/gui/src/app/workspace/service/workflow-websocket/workflow-websocket.service.ts b/frontend/src/app/workspace/service/workflow-websocket/workflow-websocket.service.ts
similarity index 97%
rename from core/gui/src/app/workspace/service/workflow-websocket/workflow-websocket.service.ts
rename to frontend/src/app/workspace/service/workflow-websocket/workflow-websocket.service.ts
index 201d797f412..90029227dd8 100644
--- a/core/gui/src/app/workspace/service/workflow-websocket/workflow-websocket.service.ts
+++ b/frontend/src/app/workspace/service/workflow-websocket/workflow-websocket.service.ts
@@ -108,9 +108,7 @@ export class WorkflowWebsocketService {
       "&uid=" +
       uId +
       (isDefined(cuId) ? `&cuid=${cuId}` : "") +
-      (this.config.env.userSystemEnabled && AuthService.getAccessToken() !== null
-        ? "&access-token=" + AuthService.getAccessToken()
-        : "");
+      (AuthService.getAccessToken() !== null ? "&access-token=" + AuthService.getAccessToken() : "");
     console.log("websocketUrl", websocketUrl);
     this.websocket = webSocket<TexeraWebsocketEvent | TexeraWebsocketRequest>(websocketUrl);
     // setup reconnection logic
diff --git a/core/gui/src/app/workspace/types/collab-websocket.interface.ts b/frontend/src/app/workspace/types/collab-websocket.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/collab-websocket.interface.ts
rename to frontend/src/app/workspace/types/collab-websocket.interface.ts
diff --git a/core/gui/src/app/workspace/types/computing-unit-connection.interface.ts b/frontend/src/app/workspace/types/computing-unit-connection.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/computing-unit-connection.interface.ts
rename to frontend/src/app/workspace/types/computing-unit-connection.interface.ts
diff --git a/core/gui/src/app/workspace/types/custom-json-schema.interface.ts b/frontend/src/app/workspace/types/custom-json-schema.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/custom-json-schema.interface.ts
rename to frontend/src/app/workspace/types/custom-json-schema.interface.ts
diff --git a/core/gui/src/app/workspace/types/execute-workflow.interface.ts b/frontend/src/app/workspace/types/execute-workflow.interface.ts
similarity index 98%
rename from core/gui/src/app/workspace/types/execute-workflow.interface.ts
rename to frontend/src/app/workspace/types/execute-workflow.interface.ts
index bf6482d06ae..23ade231998 100644
--- a/core/gui/src/app/workspace/types/execute-workflow.interface.ts
+++ b/frontend/src/app/workspace/types/execute-workflow.interface.ts
@@ -23,7 +23,8 @@
  * These interfaces confront to the backend API.
  */
 
-import { WorkflowFatalError, OperatorCurrentTuples } from "./workflow-websocket.interface";
+import { OperatorCurrentTuples, WorkflowFatalError } from "./workflow-websocket.interface";
+
 export interface PortIdentity
   extends Readonly<{
     id: number;
@@ -84,6 +85,7 @@ export interface OperatorStatistics
     inputPortMetrics: Record<string, number>;
     aggregatedOutputRowCount: number;
     outputPortMetrics: Record<string, number>;
+    numWorkers?: number;
   }> {}
 
 export interface OperatorStatsUpdate
diff --git a/core/gui/src/app/workspace/types/operator-schema.interface.ts b/frontend/src/app/workspace/types/operator-schema.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/operator-schema.interface.ts
rename to frontend/src/app/workspace/types/operator-schema.interface.ts
diff --git a/core/gui/src/app/workspace/types/result-table.interface.ts b/frontend/src/app/workspace/types/result-table.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/result-table.interface.ts
rename to frontend/src/app/workspace/types/result-table.interface.ts
diff --git a/core/gui/src/app/workspace/types/shared-editing.interface.ts b/frontend/src/app/workspace/types/shared-editing.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/shared-editing.interface.ts
rename to frontend/src/app/workspace/types/shared-editing.interface.ts
diff --git a/core/gui/src/app/workspace/types/workflow-common.interface.ts b/frontend/src/app/workspace/types/workflow-common.interface.ts
similarity index 97%
rename from core/gui/src/app/workspace/types/workflow-common.interface.ts
rename to frontend/src/app/workspace/types/workflow-common.interface.ts
index f210e01f05b..74cfeac5755 100644
--- a/core/gui/src/app/workspace/types/workflow-common.interface.ts
+++ b/frontend/src/app/workspace/types/workflow-common.interface.ts
@@ -100,7 +100,7 @@ export interface OperatorLink
   }> {}
 
 /**
- * refer to src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ConsoleMessage.scala
+ * refer to src/main/scalapb/org/apache/texera/web/workflowruntimestate/ConsoleMessage.scala
  */
 export type ConsoleMessage = Readonly<{
   workerId: string;
diff --git a/core/gui/src/app/workspace/types/workflow-compiling.interface.ts b/frontend/src/app/workspace/types/workflow-compiling.interface.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/workflow-compiling.interface.ts
rename to frontend/src/app/workspace/types/workflow-compiling.interface.ts
diff --git a/core/gui/src/app/workspace/types/workflow-computing-unit.ts b/frontend/src/app/workspace/types/workflow-computing-unit.ts
similarity index 100%
rename from core/gui/src/app/workspace/types/workflow-computing-unit.ts
rename to frontend/src/app/workspace/types/workflow-computing-unit.ts
diff --git a/core/gui/src/app/workspace/types/workflow-websocket.interface.ts b/frontend/src/app/workspace/types/workflow-websocket.interface.ts
similarity index 95%
rename from core/gui/src/app/workspace/types/workflow-websocket.interface.ts
rename to frontend/src/app/workspace/types/workflow-websocket.interface.ts
index 0b25a5880ee..afd5ea6f04a 100644
--- a/core/gui/src/app/workspace/types/workflow-websocket.interface.ts
+++ b/frontend/src/app/workspace/types/workflow-websocket.interface.ts
@@ -21,9 +21,9 @@ import {
   ExecutionState,
   LogicalOperator,
   LogicalPlan,
+  OperatorStatsUpdate,
   WebOutputMode,
   WorkflowResultUpdateEvent,
-  OperatorStatsUpdate,
 } from "./execute-workflow.interface";
 import { IndexableObject } from "./result-table.interface";
 import { ConsoleUpdateEvent } from "./workflow-common.interface";
@@ -94,6 +94,9 @@ export type PaginationRequest = Readonly<{
   operatorID: string;
   pageIndex: number;
   pageSize: number;
+  columnOffset?: number;
+  columnLimit?: number;
+  columnSearch?: string;
 }>;
 
 export type PaginatedResultEvent = Readonly<{
@@ -173,6 +176,15 @@ export type ClusterStatusUpdateEvent = Readonly<{
   numWorkers: number;
 }>;
 
+export type RegionUpdateEvent = Readonly<{
+  regions: readonly [number, string[]][];
+}>;
+
+export type RegionStateEvent = Readonly<{
+  id: number;
+  state: string;
+}>;
+
 export type ModifyLogicResponse = Readonly<{
   opId: string;
   isValid: boolean;
@@ -229,6 +241,8 @@ export type TexeraWebsocketEventTypeMap = {
   ModifyLogicCompletedEvent: ModifyLogicCompletedEvent;
   ExecutionDurationUpdateEvent: ExecutionDurationUpdateEvent;
   ClusterStatusUpdateEvent: ClusterStatusUpdateEvent;
+  RegionUpdateEvent: RegionUpdateEvent;
+  RegionStateEvent: RegionStateEvent;
 };
 
 // helper type definitions to generate the request and event types
diff --git a/frontend/src/assets/.gitkeep b/frontend/src/assets/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/core/gui/src/assets/Tutor_End_Sample.gif b/frontend/src/assets/Tutor_End_Sample.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_End_Sample.gif
rename to frontend/src/assets/Tutor_End_Sample.gif
diff --git a/core/gui/src/assets/Tutor_Intro_Drag_Result.gif b/frontend/src/assets/Tutor_Intro_Drag_Result.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_Intro_Drag_Result.gif
rename to frontend/src/assets/Tutor_Intro_Drag_Result.gif
diff --git a/core/gui/src/assets/Tutor_Intro_Drag_Srouce.gif b/frontend/src/assets/Tutor_Intro_Drag_Srouce.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_Intro_Drag_Srouce.gif
rename to frontend/src/assets/Tutor_Intro_Drag_Srouce.gif
diff --git a/core/gui/src/assets/Tutor_Intro_Sample.jpeg b/frontend/src/assets/Tutor_Intro_Sample.jpeg
similarity index 100%
rename from core/gui/src/assets/Tutor_Intro_Sample.jpeg
rename to frontend/src/assets/Tutor_Intro_Sample.jpeg
diff --git a/core/gui/src/assets/Tutor_JointJS_Sample.gif b/frontend/src/assets/Tutor_JointJS_Sample.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_JointJS_Sample.gif
rename to frontend/src/assets/Tutor_JointJS_Sample.gif
diff --git a/core/gui/src/assets/Tutor_OpenResult_Sample.gif b/frontend/src/assets/Tutor_OpenResult_Sample.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_OpenResult_Sample.gif
rename to frontend/src/assets/Tutor_OpenResult_Sample.gif
diff --git a/core/gui/src/assets/Tutor_OpenSection_Sample.gif b/frontend/src/assets/Tutor_OpenSection_Sample.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_OpenSection_Sample.gif
rename to frontend/src/assets/Tutor_OpenSection_Sample.gif
diff --git a/core/gui/src/assets/Tutor_Property_Sample.gif b/frontend/src/assets/Tutor_Property_Sample.gif
similarity index 100%
rename from core/gui/src/assets/Tutor_Property_Sample.gif
rename to frontend/src/assets/Tutor_Property_Sample.gif
diff --git a/core/gui/src/assets/card_background.jpg b/frontend/src/assets/card_background.jpg
similarity index 100%
rename from core/gui/src/assets/card_background.jpg
rename to frontend/src/assets/card_background.jpg
diff --git a/core/gui/src/assets/logos/android-chrome-192x192.png b/frontend/src/assets/logos/android-chrome-192x192.png
similarity index 100%
rename from core/gui/src/assets/logos/android-chrome-192x192.png
rename to frontend/src/assets/logos/android-chrome-192x192.png
diff --git a/core/gui/src/assets/logos/android-chrome-512x512.png b/frontend/src/assets/logos/android-chrome-512x512.png
similarity index 100%
rename from core/gui/src/assets/logos/android-chrome-512x512.png
rename to frontend/src/assets/logos/android-chrome-512x512.png
diff --git a/core/gui/src/assets/logos/apple-touch-icon.png b/frontend/src/assets/logos/apple-touch-icon.png
similarity index 100%
rename from core/gui/src/assets/logos/apple-touch-icon.png
rename to frontend/src/assets/logos/apple-touch-icon.png
diff --git a/core/gui/src/assets/logos/favicon-16x16.png b/frontend/src/assets/logos/favicon-16x16.png
similarity index 100%
rename from core/gui/src/assets/logos/favicon-16x16.png
rename to frontend/src/assets/logos/favicon-16x16.png
diff --git a/core/gui/src/assets/logos/favicon-32x32.png b/frontend/src/assets/logos/favicon-32x32.png
similarity index 100%
rename from core/gui/src/assets/logos/favicon-32x32.png
rename to frontend/src/assets/logos/favicon-32x32.png
diff --git a/core/gui/src/assets/logos/favicon.ico b/frontend/src/assets/logos/favicon.ico
similarity index 100%
rename from core/gui/src/assets/logos/favicon.ico
rename to frontend/src/assets/logos/favicon.ico
diff --git a/core/gui/src/assets/logos/full_logo_small.png b/frontend/src/assets/logos/full_logo_small.png
similarity index 100%
rename from core/gui/src/assets/logos/full_logo_small.png
rename to frontend/src/assets/logos/full_logo_small.png
diff --git a/core/gui/src/assets/logos/logo.png b/frontend/src/assets/logos/logo.png
similarity index 100%
rename from core/gui/src/assets/logos/logo.png
rename to frontend/src/assets/logos/logo.png
diff --git a/core/gui/src/assets/logos/site.webmanifest b/frontend/src/assets/logos/site.webmanifest
similarity index 100%
rename from core/gui/src/assets/logos/site.webmanifest
rename to frontend/src/assets/logos/site.webmanifest
diff --git a/frontend/src/assets/migration_tool/mapping.ts b/frontend/src/assets/migration_tool/mapping.ts
new file mode 100644
index 00000000000..e600e813fba
--- /dev/null
+++ b/frontend/src/assets/migration_tool/mapping.ts
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+interface MappingContent {
+  cell_to_operator: { [key: string]: any };
+  operator_to_cell: { [key: string]: any };
+}
+
+const mapping: { [key: string]: MappingContent } = {
+  default: {
+    cell_to_operator: {},
+    operator_to_cell: {},
+  },
+};
+
+export default mapping;
diff --git a/core/gui/src/assets/operator_images/AdhocSink.png b/frontend/src/assets/operator_images/AdhocSink.png
similarity index 100%
rename from core/gui/src/assets/operator_images/AdhocSink.png
rename to frontend/src/assets/operator_images/AdhocSink.png
diff --git a/core/gui/src/assets/operator_images/Aggregate.png b/frontend/src/assets/operator_images/Aggregate.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Aggregate.png
rename to frontend/src/assets/operator_images/Aggregate.png
diff --git a/core/gui/src/assets/operator_images/Aggregation.png b/frontend/src/assets/operator_images/Aggregation.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Aggregation.png
rename to frontend/src/assets/operator_images/Aggregation.png
diff --git a/core/gui/src/assets/operator_images/ArrowSource.png b/frontend/src/assets/operator_images/ArrowSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ArrowSource.png
rename to frontend/src/assets/operator_images/ArrowSource.png
diff --git a/core/gui/src/assets/operator_images/AsterixDBSource.png b/frontend/src/assets/operator_images/AsterixDBSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/AsterixDBSource.png
rename to frontend/src/assets/operator_images/AsterixDBSource.png
diff --git a/core/gui/src/assets/operator_images/BarChart.png b/frontend/src/assets/operator_images/BarChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/BarChart.png
rename to frontend/src/assets/operator_images/BarChart.png
diff --git a/core/gui/src/assets/operator_images/BoxViolinPlot.png b/frontend/src/assets/operator_images/BoxViolinPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/BoxViolinPlot.png
rename to frontend/src/assets/operator_images/BoxViolinPlot.png
diff --git a/core/gui/src/assets/operator_images/BubbleChart.png b/frontend/src/assets/operator_images/BubbleChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/BubbleChart.png
rename to frontend/src/assets/operator_images/BubbleChart.png
diff --git a/core/gui/src/assets/operator_images/BulletChart.png b/frontend/src/assets/operator_images/BulletChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/BulletChart.png
rename to frontend/src/assets/operator_images/BulletChart.png
diff --git a/core/gui/src/assets/operator_images/CSVFileScan.png b/frontend/src/assets/operator_images/CSVFileScan.png
similarity index 100%
rename from core/gui/src/assets/operator_images/CSVFileScan.png
rename to frontend/src/assets/operator_images/CSVFileScan.png
diff --git a/core/gui/src/assets/operator_images/CSVOldFileScan.png b/frontend/src/assets/operator_images/CSVOldFileScan.png
similarity index 100%
rename from core/gui/src/assets/operator_images/CSVOldFileScan.png
rename to frontend/src/assets/operator_images/CSVOldFileScan.png
diff --git a/core/gui/src/assets/operator_images/CandlestickChart.png b/frontend/src/assets/operator_images/CandlestickChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/CandlestickChart.png
rename to frontend/src/assets/operator_images/CandlestickChart.png
diff --git a/core/gui/src/assets/operator_images/CartesianProduct.png b/frontend/src/assets/operator_images/CartesianProduct.png
similarity index 100%
rename from core/gui/src/assets/operator_images/CartesianProduct.png
rename to frontend/src/assets/operator_images/CartesianProduct.png
diff --git a/core/gui/src/assets/operator_images/ChoroplethMap.png b/frontend/src/assets/operator_images/ChoroplethMap.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ChoroplethMap.png
rename to frontend/src/assets/operator_images/ChoroplethMap.png
diff --git a/core/gui/src/assets/operator_images/Comparison.png b/frontend/src/assets/operator_images/Comparison.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Comparison.png
rename to frontend/src/assets/operator_images/Comparison.png
diff --git a/core/gui/src/assets/operator_images/ContinuousErrorBands.png b/frontend/src/assets/operator_images/ContinuousErrorBands.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ContinuousErrorBands.png
rename to frontend/src/assets/operator_images/ContinuousErrorBands.png
diff --git a/core/gui/src/assets/operator_images/ContourPlot.png b/frontend/src/assets/operator_images/ContourPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ContourPlot.png
rename to frontend/src/assets/operator_images/ContourPlot.png
diff --git a/core/gui/src/assets/operator_images/Dendrogram.png b/frontend/src/assets/operator_images/Dendrogram.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Dendrogram.png
rename to frontend/src/assets/operator_images/Dendrogram.png
diff --git a/core/gui/src/assets/operator_images/DictionaryMatcher.png b/frontend/src/assets/operator_images/DictionaryMatcher.png
similarity index 100%
rename from core/gui/src/assets/operator_images/DictionaryMatcher.png
rename to frontend/src/assets/operator_images/DictionaryMatcher.png
diff --git a/core/gui/src/assets/operator_images/DictionarySource.png b/frontend/src/assets/operator_images/DictionarySource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/DictionarySource.png
rename to frontend/src/assets/operator_images/DictionarySource.png
diff --git a/core/gui/src/assets/operator_images/Difference.png b/frontend/src/assets/operator_images/Difference.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Difference.png
rename to frontend/src/assets/operator_images/Difference.png
diff --git a/core/gui/src/assets/operator_images/Distinct.png b/frontend/src/assets/operator_images/Distinct.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Distinct.png
rename to frontend/src/assets/operator_images/Distinct.png
diff --git a/core/gui/src/assets/operator_images/DotPlot.png b/frontend/src/assets/operator_images/DotPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/DotPlot.png
rename to frontend/src/assets/operator_images/DotPlot.png
diff --git a/core/gui/src/assets/operator_images/DualInputPortsPythonUDFV2.png b/frontend/src/assets/operator_images/DualInputPortsPythonUDFV2.png
similarity index 100%
rename from core/gui/src/assets/operator_images/DualInputPortsPythonUDFV2.png
rename to frontend/src/assets/operator_images/DualInputPortsPythonUDFV2.png
diff --git a/core/gui/src/assets/operator_images/DumbbellPlot.png b/frontend/src/assets/operator_images/DumbbellPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/DumbbellPlot.png
rename to frontend/src/assets/operator_images/DumbbellPlot.png
diff --git a/core/gui/src/assets/operator_images/Dummy.png b/frontend/src/assets/operator_images/Dummy.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Dummy.png
rename to frontend/src/assets/operator_images/Dummy.png
diff --git a/core/gui/src/assets/operator_images/EmojiSentiment.png b/frontend/src/assets/operator_images/EmojiSentiment.png
similarity index 100%
rename from core/gui/src/assets/operator_images/EmojiSentiment.png
rename to frontend/src/assets/operator_images/EmojiSentiment.png
diff --git a/core/gui/src/assets/operator_images/FigureFactoryTable.png b/frontend/src/assets/operator_images/FigureFactoryTable.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FigureFactoryTable.png
rename to frontend/src/assets/operator_images/FigureFactoryTable.png
diff --git a/core/gui/src/assets/operator_images/FileScan.png b/frontend/src/assets/operator_images/FileScan.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FileScan.png
rename to frontend/src/assets/operator_images/FileScan.png
diff --git a/core/gui/src/assets/operator_images/FileSource.png b/frontend/src/assets/operator_images/FileSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FileSource.png
rename to frontend/src/assets/operator_images/FileSource.png
diff --git a/core/gui/src/assets/operator_images/FilledAreaPlot.png b/frontend/src/assets/operator_images/FilledAreaPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FilledAreaPlot.png
rename to frontend/src/assets/operator_images/FilledAreaPlot.png
diff --git a/core/gui/src/assets/operator_images/Filter.png b/frontend/src/assets/operator_images/Filter.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Filter.png
rename to frontend/src/assets/operator_images/Filter.png
diff --git a/core/gui/src/assets/operator_images/FunnelPlot.png b/frontend/src/assets/operator_images/FunnelPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FunnelPlot.png
rename to frontend/src/assets/operator_images/FunnelPlot.png
diff --git a/core/gui/src/assets/operator_images/FuzzyTokenMatcher.png b/frontend/src/assets/operator_images/FuzzyTokenMatcher.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FuzzyTokenMatcher.png
rename to frontend/src/assets/operator_images/FuzzyTokenMatcher.png
diff --git a/core/gui/src/assets/operator_images/FuzzyTokenSource.png b/frontend/src/assets/operator_images/FuzzyTokenSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/FuzzyTokenSource.png
rename to frontend/src/assets/operator_images/FuzzyTokenSource.png
diff --git a/core/gui/src/assets/operator_images/GanttChart.png b/frontend/src/assets/operator_images/GanttChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/GanttChart.png
rename to frontend/src/assets/operator_images/GanttChart.png
diff --git a/core/gui/src/assets/operator_images/GaugeChart.png b/frontend/src/assets/operator_images/GaugeChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/GaugeChart.png
rename to frontend/src/assets/operator_images/GaugeChart.png
diff --git a/core/gui/src/assets/operator_images/HTMLVisualizer.png b/frontend/src/assets/operator_images/HTMLVisualizer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HTMLVisualizer.png
rename to frontend/src/assets/operator_images/HTMLVisualizer.png
diff --git a/core/gui/src/assets/operator_images/HashJoin.png b/frontend/src/assets/operator_images/HashJoin.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HashJoin.png
rename to frontend/src/assets/operator_images/HashJoin.png
diff --git a/core/gui/src/assets/operator_images/HdfsFileScan.png b/frontend/src/assets/operator_images/HdfsFileScan.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HdfsFileScan.png
rename to frontend/src/assets/operator_images/HdfsFileScan.png
diff --git a/core/gui/src/assets/operator_images/HeatMap.png b/frontend/src/assets/operator_images/HeatMap.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HeatMap.png
rename to frontend/src/assets/operator_images/HeatMap.png
diff --git a/core/gui/src/assets/operator_images/HierarchyChart.png b/frontend/src/assets/operator_images/HierarchyChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HierarchyChart.png
rename to frontend/src/assets/operator_images/HierarchyChart.png
diff --git a/core/gui/src/assets/operator_images/Histogram.png b/frontend/src/assets/operator_images/Histogram.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Histogram.png
rename to frontend/src/assets/operator_images/Histogram.png
diff --git a/core/gui/src/assets/operator_images/Histogram2D.png b/frontend/src/assets/operator_images/Histogram2D.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Histogram2D.png
rename to frontend/src/assets/operator_images/Histogram2D.png
diff --git a/core/gui/src/assets/operator_images/HuggingFaceIrisLogisticRegression.png b/frontend/src/assets/operator_images/HuggingFaceIrisLogisticRegression.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HuggingFaceIrisLogisticRegression.png
rename to frontend/src/assets/operator_images/HuggingFaceIrisLogisticRegression.png
diff --git a/core/gui/src/assets/operator_images/HuggingFaceSentimentAnalysis.png b/frontend/src/assets/operator_images/HuggingFaceSentimentAnalysis.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HuggingFaceSentimentAnalysis.png
rename to frontend/src/assets/operator_images/HuggingFaceSentimentAnalysis.png
diff --git a/core/gui/src/assets/operator_images/HuggingFaceSpamSMSDetection.png b/frontend/src/assets/operator_images/HuggingFaceSpamSMSDetection.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HuggingFaceSpamSMSDetection.png
rename to frontend/src/assets/operator_images/HuggingFaceSpamSMSDetection.png
diff --git a/core/gui/src/assets/operator_images/HuggingFaceTextSummarization.png b/frontend/src/assets/operator_images/HuggingFaceTextSummarization.png
similarity index 100%
rename from core/gui/src/assets/operator_images/HuggingFaceTextSummarization.png
rename to frontend/src/assets/operator_images/HuggingFaceTextSummarization.png
diff --git a/core/gui/src/assets/operator_images/IcicleChart.png b/frontend/src/assets/operator_images/IcicleChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/IcicleChart.png
rename to frontend/src/assets/operator_images/IcicleChart.png
diff --git a/core/gui/src/assets/operator_images/If.png b/frontend/src/assets/operator_images/If.png
similarity index 100%
rename from core/gui/src/assets/operator_images/If.png
rename to frontend/src/assets/operator_images/If.png
diff --git a/core/gui/src/assets/operator_images/ImageVisualizer.png b/frontend/src/assets/operator_images/ImageVisualizer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ImageVisualizer.png
rename to frontend/src/assets/operator_images/ImageVisualizer.png
diff --git a/core/gui/src/assets/operator_images/Intersect.png b/frontend/src/assets/operator_images/Intersect.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Intersect.png
rename to frontend/src/assets/operator_images/Intersect.png
diff --git a/core/gui/src/assets/operator_images/IntervalJoin.png b/frontend/src/assets/operator_images/IntervalJoin.png
similarity index 100%
rename from core/gui/src/assets/operator_images/IntervalJoin.png
rename to frontend/src/assets/operator_images/IntervalJoin.png
diff --git a/core/gui/src/assets/operator_images/JSONLFileScan.png b/frontend/src/assets/operator_images/JSONLFileScan.png
similarity index 100%
rename from core/gui/src/assets/operator_images/JSONLFileScan.png
rename to frontend/src/assets/operator_images/JSONLFileScan.png
diff --git a/core/gui/src/assets/operator_images/JavaUDF.png b/frontend/src/assets/operator_images/JavaUDF.png
similarity index 100%
rename from core/gui/src/assets/operator_images/JavaUDF.png
rename to frontend/src/assets/operator_images/JavaUDF.png
diff --git a/core/gui/src/assets/operator_images/JoinDistance.png b/frontend/src/assets/operator_images/JoinDistance.png
similarity index 100%
rename from core/gui/src/assets/operator_images/JoinDistance.png
rename to frontend/src/assets/operator_images/JoinDistance.png
diff --git a/core/gui/src/assets/operator_images/KNNClassifierTrainer.png b/frontend/src/assets/operator_images/KNNClassifierTrainer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/KNNClassifierTrainer.png
rename to frontend/src/assets/operator_images/KNNClassifierTrainer.png
diff --git a/core/gui/src/assets/operator_images/KNNRegressorTrainer.png b/frontend/src/assets/operator_images/KNNRegressorTrainer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/KNNRegressorTrainer.png
rename to frontend/src/assets/operator_images/KNNRegressorTrainer.png
diff --git a/core/gui/src/assets/operator_images/KeywordMatcher.png b/frontend/src/assets/operator_images/KeywordMatcher.png
similarity index 100%
rename from core/gui/src/assets/operator_images/KeywordMatcher.png
rename to frontend/src/assets/operator_images/KeywordMatcher.png
diff --git a/core/gui/src/assets/operator_images/KeywordSearch.png b/frontend/src/assets/operator_images/KeywordSearch.png
similarity index 100%
rename from core/gui/src/assets/operator_images/KeywordSearch.png
rename to frontend/src/assets/operator_images/KeywordSearch.png
diff --git a/core/gui/src/assets/operator_images/KeywordSource.png b/frontend/src/assets/operator_images/KeywordSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/KeywordSource.png
rename to frontend/src/assets/operator_images/KeywordSource.png
diff --git a/core/gui/src/assets/operator_images/Limit.png b/frontend/src/assets/operator_images/Limit.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Limit.png
rename to frontend/src/assets/operator_images/Limit.png
diff --git a/core/gui/src/assets/operator_images/LineChart.png b/frontend/src/assets/operator_images/LineChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/LineChart.png
rename to frontend/src/assets/operator_images/LineChart.png
diff --git a/core/gui/src/assets/operator_images/LocalFileScan.png b/frontend/src/assets/operator_images/LocalFileScan.png
similarity index 100%
rename from core/gui/src/assets/operator_images/LocalFileScan.png
rename to frontend/src/assets/operator_images/LocalFileScan.png
diff --git a/core/gui/src/assets/operator_images/MySQLSource.png b/frontend/src/assets/operator_images/MySQLSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/MySQLSource.png
rename to frontend/src/assets/operator_images/MySQLSource.png
diff --git a/core/gui/src/assets/operator_images/MysqlSink.png b/frontend/src/assets/operator_images/MysqlSink.png
similarity index 100%
rename from core/gui/src/assets/operator_images/MysqlSink.png
rename to frontend/src/assets/operator_images/MysqlSink.png
diff --git a/core/gui/src/assets/operator_images/NestedTable.png b/frontend/src/assets/operator_images/NestedTable.png
similarity index 100%
rename from core/gui/src/assets/operator_images/NestedTable.png
rename to frontend/src/assets/operator_images/NestedTable.png
diff --git a/core/gui/src/assets/operator_images/NetworkGraph.png b/frontend/src/assets/operator_images/NetworkGraph.png
similarity index 100%
rename from core/gui/src/assets/operator_images/NetworkGraph.png
rename to frontend/src/assets/operator_images/NetworkGraph.png
diff --git a/core/gui/src/assets/operator_images/NlpEntity.png b/frontend/src/assets/operator_images/NlpEntity.png
similarity index 100%
rename from core/gui/src/assets/operator_images/NlpEntity.png
rename to frontend/src/assets/operator_images/NlpEntity.png
diff --git a/core/gui/src/assets/operator_images/NlpSentiment.png b/frontend/src/assets/operator_images/NlpSentiment.png
similarity index 100%
rename from core/gui/src/assets/operator_images/NlpSentiment.png
rename to frontend/src/assets/operator_images/NlpSentiment.png
diff --git a/core/gui/src/assets/operator_images/NlpSplit.png b/frontend/src/assets/operator_images/NlpSplit.png
similarity index 100%
rename from core/gui/src/assets/operator_images/NlpSplit.png
rename to frontend/src/assets/operator_images/NlpSplit.png
diff --git a/core/gui/src/assets/operator_images/NltkSentiment.png b/frontend/src/assets/operator_images/NltkSentiment.png
similarity index 100%
rename from core/gui/src/assets/operator_images/NltkSentiment.png
rename to frontend/src/assets/operator_images/NltkSentiment.png
diff --git a/core/gui/src/assets/operator_images/PieChart.png b/frontend/src/assets/operator_images/PieChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/PieChart.png
rename to frontend/src/assets/operator_images/PieChart.png
diff --git a/core/gui/src/assets/operator_images/PostgreSQLSource.png b/frontend/src/assets/operator_images/PostgreSQLSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/PostgreSQLSource.png
rename to frontend/src/assets/operator_images/PostgreSQLSource.png
diff --git a/core/gui/src/assets/operator_images/Projection.png b/frontend/src/assets/operator_images/Projection.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Projection.png
rename to frontend/src/assets/operator_images/Projection.png
diff --git a/core/gui/src/assets/operator_images/PythonLambdaFunction.png b/frontend/src/assets/operator_images/PythonLambdaFunction.png
similarity index 100%
rename from core/gui/src/assets/operator_images/PythonLambdaFunction.png
rename to frontend/src/assets/operator_images/PythonLambdaFunction.png
diff --git a/core/gui/src/assets/operator_images/PythonTableReducer.png b/frontend/src/assets/operator_images/PythonTableReducer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/PythonTableReducer.png
rename to frontend/src/assets/operator_images/PythonTableReducer.png
diff --git a/core/gui/src/assets/operator_images/PythonUDFSourceV2.png b/frontend/src/assets/operator_images/PythonUDFSourceV2.png
similarity index 100%
rename from core/gui/src/assets/operator_images/PythonUDFSourceV2.png
rename to frontend/src/assets/operator_images/PythonUDFSourceV2.png
diff --git a/core/gui/src/assets/operator_images/PythonUDFV2.png b/frontend/src/assets/operator_images/PythonUDFV2.png
similarity index 100%
rename from core/gui/src/assets/operator_images/PythonUDFV2.png
rename to frontend/src/assets/operator_images/PythonUDFV2.png
diff --git a/core/gui/src/assets/operator_images/QuiverPlot.png b/frontend/src/assets/operator_images/QuiverPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/QuiverPlot.png
rename to frontend/src/assets/operator_images/QuiverPlot.png
diff --git a/core/gui/src/assets/operator_images/RUDF.png b/frontend/src/assets/operator_images/RUDF.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RUDF.png
rename to frontend/src/assets/operator_images/RUDF.png
diff --git a/core/gui/src/assets/operator_images/RUDFSource.png b/frontend/src/assets/operator_images/RUDFSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RUDFSource.png
rename to frontend/src/assets/operator_images/RUDFSource.png
diff --git a/core/gui/src/assets/operator_images/RandomKSampling.png b/frontend/src/assets/operator_images/RandomKSampling.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RandomKSampling.png
rename to frontend/src/assets/operator_images/RandomKSampling.png
diff --git a/core/gui/src/assets/operator_images/RangeSlider.png b/frontend/src/assets/operator_images/RangeSlider.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RangeSlider.png
rename to frontend/src/assets/operator_images/RangeSlider.png
diff --git a/core/gui/src/assets/operator_images/RedditSearch.png b/frontend/src/assets/operator_images/RedditSearch.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RedditSearch.png
rename to frontend/src/assets/operator_images/RedditSearch.png
diff --git a/core/gui/src/assets/operator_images/Regex.png b/frontend/src/assets/operator_images/Regex.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Regex.png
rename to frontend/src/assets/operator_images/Regex.png
diff --git a/core/gui/src/assets/operator_images/RegexMatcher.png b/frontend/src/assets/operator_images/RegexMatcher.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RegexMatcher.png
rename to frontend/src/assets/operator_images/RegexMatcher.png
diff --git a/core/gui/src/assets/operator_images/RegexSource.png b/frontend/src/assets/operator_images/RegexSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RegexSource.png
rename to frontend/src/assets/operator_images/RegexSource.png
diff --git a/core/gui/src/assets/operator_images/RegexSplit.png b/frontend/src/assets/operator_images/RegexSplit.png
similarity index 100%
rename from core/gui/src/assets/operator_images/RegexSplit.png
rename to frontend/src/assets/operator_images/RegexSplit.png
diff --git a/core/gui/src/assets/operator_images/ReservoirSampling.png b/frontend/src/assets/operator_images/ReservoirSampling.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ReservoirSampling.png
rename to frontend/src/assets/operator_images/ReservoirSampling.png
diff --git a/core/gui/src/assets/operator_images/SVCTrainer.png b/frontend/src/assets/operator_images/SVCTrainer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SVCTrainer.png
rename to frontend/src/assets/operator_images/SVCTrainer.png
diff --git a/core/gui/src/assets/operator_images/SVMClassifierTrainer.png b/frontend/src/assets/operator_images/SVMClassifierTrainer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SVMClassifierTrainer.png
rename to frontend/src/assets/operator_images/SVMClassifierTrainer.png
diff --git a/core/gui/src/assets/operator_images/SVMRegressorTrainer.png b/frontend/src/assets/operator_images/SVMRegressorTrainer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SVMRegressorTrainer.png
rename to frontend/src/assets/operator_images/SVMRegressorTrainer.png
diff --git a/core/gui/src/assets/operator_images/SVRTrainer.png b/frontend/src/assets/operator_images/SVRTrainer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SVRTrainer.png
rename to frontend/src/assets/operator_images/SVRTrainer.png
diff --git a/core/gui/src/assets/operator_images/Sampler.png b/frontend/src/assets/operator_images/Sampler.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Sampler.png
rename to frontend/src/assets/operator_images/Sampler.png
diff --git a/core/gui/src/assets/operator_images/SankeyDiagram.png b/frontend/src/assets/operator_images/SankeyDiagram.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SankeyDiagram.png
rename to frontend/src/assets/operator_images/SankeyDiagram.png
diff --git a/core/gui/src/assets/operator_images/ScanSource.png b/frontend/src/assets/operator_images/ScanSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ScanSource.png
rename to frontend/src/assets/operator_images/ScanSource.png
diff --git a/core/gui/src/assets/operator_images/Scatter3DChart.png b/frontend/src/assets/operator_images/Scatter3DChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Scatter3DChart.png
rename to frontend/src/assets/operator_images/Scatter3DChart.png
diff --git a/core/gui/src/assets/operator_images/ScatterMatrixChart.png b/frontend/src/assets/operator_images/ScatterMatrixChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ScatterMatrixChart.png
rename to frontend/src/assets/operator_images/ScatterMatrixChart.png
diff --git a/core/gui/src/assets/operator_images/Scatterplot.png b/frontend/src/assets/operator_images/Scatterplot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Scatterplot.png
rename to frontend/src/assets/operator_images/Scatterplot.png
diff --git a/core/gui/src/assets/operator_images/Scorer.png b/frontend/src/assets/operator_images/Scorer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Scorer.png
rename to frontend/src/assets/operator_images/Scorer.png
diff --git a/core/gui/src/assets/operator_images/SentimentAnalysis.png b/frontend/src/assets/operator_images/SentimentAnalysis.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SentimentAnalysis.png
rename to frontend/src/assets/operator_images/SentimentAnalysis.png
diff --git a/core/gui/src/assets/operator_images/SimilarityJoin.png b/frontend/src/assets/operator_images/SimilarityJoin.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SimilarityJoin.png
rename to frontend/src/assets/operator_images/SimilarityJoin.png
diff --git a/core/gui/src/assets/operator_images/SimpleSink.png b/frontend/src/assets/operator_images/SimpleSink.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SimpleSink.png
rename to frontend/src/assets/operator_images/SimpleSink.png
diff --git a/core/gui/src/assets/operator_images/SklearnAdaptiveBoosting.png b/frontend/src/assets/operator_images/SklearnAdaptiveBoosting.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnAdaptiveBoosting.png
rename to frontend/src/assets/operator_images/SklearnAdaptiveBoosting.png
diff --git a/core/gui/src/assets/operator_images/SklearnBagging.png b/frontend/src/assets/operator_images/SklearnBagging.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnBagging.png
rename to frontend/src/assets/operator_images/SklearnBagging.png
diff --git a/core/gui/src/assets/operator_images/SklearnBernoulliNaiveBayes.png b/frontend/src/assets/operator_images/SklearnBernoulliNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnBernoulliNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnBernoulliNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnComplementNaiveBayes.png b/frontend/src/assets/operator_images/SklearnComplementNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnComplementNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnComplementNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnDecisionTree.png b/frontend/src/assets/operator_images/SklearnDecisionTree.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnDecisionTree.png
rename to frontend/src/assets/operator_images/SklearnDecisionTree.png
diff --git a/core/gui/src/assets/operator_images/SklearnDummy.png b/frontend/src/assets/operator_images/SklearnDummy.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnDummy.png
rename to frontend/src/assets/operator_images/SklearnDummy.png
diff --git a/core/gui/src/assets/operator_images/SklearnExtraTree.png b/frontend/src/assets/operator_images/SklearnExtraTree.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnExtraTree.png
rename to frontend/src/assets/operator_images/SklearnExtraTree.png
diff --git a/core/gui/src/assets/operator_images/SklearnExtraTrees.png b/frontend/src/assets/operator_images/SklearnExtraTrees.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnExtraTrees.png
rename to frontend/src/assets/operator_images/SklearnExtraTrees.png
diff --git a/core/gui/src/assets/operator_images/SklearnGaussianNaiveBayes.png b/frontend/src/assets/operator_images/SklearnGaussianNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnGaussianNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnGaussianNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnGradientBoosting.png b/frontend/src/assets/operator_images/SklearnGradientBoosting.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnGradientBoosting.png
rename to frontend/src/assets/operator_images/SklearnGradientBoosting.png
diff --git a/core/gui/src/assets/operator_images/SklearnKNN.png b/frontend/src/assets/operator_images/SklearnKNN.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnKNN.png
rename to frontend/src/assets/operator_images/SklearnKNN.png
diff --git a/core/gui/src/assets/operator_images/SklearnLinearRegression.png b/frontend/src/assets/operator_images/SklearnLinearRegression.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnLinearRegression.png
rename to frontend/src/assets/operator_images/SklearnLinearRegression.png
diff --git a/core/gui/src/assets/operator_images/SklearnLinearSVM.png b/frontend/src/assets/operator_images/SklearnLinearSVM.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnLinearSVM.png
rename to frontend/src/assets/operator_images/SklearnLinearSVM.png
diff --git a/core/gui/src/assets/operator_images/SklearnLogisticRegression.png b/frontend/src/assets/operator_images/SklearnLogisticRegression.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnLogisticRegression.png
rename to frontend/src/assets/operator_images/SklearnLogisticRegression.png
diff --git a/core/gui/src/assets/operator_images/SklearnLogisticRegressionCV.png b/frontend/src/assets/operator_images/SklearnLogisticRegressionCV.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnLogisticRegressionCV.png
rename to frontend/src/assets/operator_images/SklearnLogisticRegressionCV.png
diff --git a/core/gui/src/assets/operator_images/SklearnMultiLayerPerceptron.png b/frontend/src/assets/operator_images/SklearnMultiLayerPerceptron.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnMultiLayerPerceptron.png
rename to frontend/src/assets/operator_images/SklearnMultiLayerPerceptron.png
diff --git a/core/gui/src/assets/operator_images/SklearnMultinomialNaiveBayes.png b/frontend/src/assets/operator_images/SklearnMultinomialNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnMultinomialNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnMultinomialNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnNearestCentroid.png b/frontend/src/assets/operator_images/SklearnNearestCentroid.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnNearestCentroid.png
rename to frontend/src/assets/operator_images/SklearnNearestCentroid.png
diff --git a/core/gui/src/assets/operator_images/SklearnPassiveAggressive.png b/frontend/src/assets/operator_images/SklearnPassiveAggressive.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnPassiveAggressive.png
rename to frontend/src/assets/operator_images/SklearnPassiveAggressive.png
diff --git a/core/gui/src/assets/operator_images/SklearnPerceptron.png b/frontend/src/assets/operator_images/SklearnPerceptron.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnPerceptron.png
rename to frontend/src/assets/operator_images/SklearnPerceptron.png
diff --git a/core/gui/src/assets/operator_images/SklearnPrediction.png b/frontend/src/assets/operator_images/SklearnPrediction.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnPrediction.png
rename to frontend/src/assets/operator_images/SklearnPrediction.png
diff --git a/core/gui/src/assets/operator_images/SklearnProbabilityCalibration.png b/frontend/src/assets/operator_images/SklearnProbabilityCalibration.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnProbabilityCalibration.png
rename to frontend/src/assets/operator_images/SklearnProbabilityCalibration.png
diff --git a/core/gui/src/assets/operator_images/SklearnRandomForest.png b/frontend/src/assets/operator_images/SklearnRandomForest.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnRandomForest.png
rename to frontend/src/assets/operator_images/SklearnRandomForest.png
diff --git a/core/gui/src/assets/operator_images/SklearnRidge.png b/frontend/src/assets/operator_images/SklearnRidge.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnRidge.png
rename to frontend/src/assets/operator_images/SklearnRidge.png
diff --git a/core/gui/src/assets/operator_images/SklearnRidgeCV.png b/frontend/src/assets/operator_images/SklearnRidgeCV.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnRidgeCV.png
rename to frontend/src/assets/operator_images/SklearnRidgeCV.png
diff --git a/core/gui/src/assets/operator_images/SklearnSDG.png b/frontend/src/assets/operator_images/SklearnSDG.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnSDG.png
rename to frontend/src/assets/operator_images/SklearnSDG.png
diff --git a/core/gui/src/assets/operator_images/SklearnSVM.png b/frontend/src/assets/operator_images/SklearnSVM.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnSVM.png
rename to frontend/src/assets/operator_images/SklearnSVM.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingAdaptiveBoosting.png b/frontend/src/assets/operator_images/SklearnTrainingAdaptiveBoosting.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingAdaptiveBoosting.png
rename to frontend/src/assets/operator_images/SklearnTrainingAdaptiveBoosting.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingBagging.png b/frontend/src/assets/operator_images/SklearnTrainingBagging.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingBagging.png
rename to frontend/src/assets/operator_images/SklearnTrainingBagging.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingBernoulliNaiveBayes.png b/frontend/src/assets/operator_images/SklearnTrainingBernoulliNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingBernoulliNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnTrainingBernoulliNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingComplementNaiveBayes.png b/frontend/src/assets/operator_images/SklearnTrainingComplementNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingComplementNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnTrainingComplementNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingDecisionTree.png b/frontend/src/assets/operator_images/SklearnTrainingDecisionTree.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingDecisionTree.png
rename to frontend/src/assets/operator_images/SklearnTrainingDecisionTree.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingDummy.png b/frontend/src/assets/operator_images/SklearnTrainingDummy.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingDummy.png
rename to frontend/src/assets/operator_images/SklearnTrainingDummy.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingExtraTree.png b/frontend/src/assets/operator_images/SklearnTrainingExtraTree.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingExtraTree.png
rename to frontend/src/assets/operator_images/SklearnTrainingExtraTree.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingExtraTrees.png b/frontend/src/assets/operator_images/SklearnTrainingExtraTrees.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingExtraTrees.png
rename to frontend/src/assets/operator_images/SklearnTrainingExtraTrees.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingGaussianNaiveBayes.png b/frontend/src/assets/operator_images/SklearnTrainingGaussianNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingGaussianNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnTrainingGaussianNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingGradientBoosting.png b/frontend/src/assets/operator_images/SklearnTrainingGradientBoosting.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingGradientBoosting.png
rename to frontend/src/assets/operator_images/SklearnTrainingGradientBoosting.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingKNN.png b/frontend/src/assets/operator_images/SklearnTrainingKNN.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingKNN.png
rename to frontend/src/assets/operator_images/SklearnTrainingKNN.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingLinearRegression.png b/frontend/src/assets/operator_images/SklearnTrainingLinearRegression.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingLinearRegression.png
rename to frontend/src/assets/operator_images/SklearnTrainingLinearRegression.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingLinearSVM.png b/frontend/src/assets/operator_images/SklearnTrainingLinearSVM.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingLinearSVM.png
rename to frontend/src/assets/operator_images/SklearnTrainingLinearSVM.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingLogisticRegression.png b/frontend/src/assets/operator_images/SklearnTrainingLogisticRegression.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingLogisticRegression.png
rename to frontend/src/assets/operator_images/SklearnTrainingLogisticRegression.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingLogisticRegressionCV.png b/frontend/src/assets/operator_images/SklearnTrainingLogisticRegressionCV.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingLogisticRegressionCV.png
rename to frontend/src/assets/operator_images/SklearnTrainingLogisticRegressionCV.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingMultiLayerPerceptron.png b/frontend/src/assets/operator_images/SklearnTrainingMultiLayerPerceptron.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingMultiLayerPerceptron.png
rename to frontend/src/assets/operator_images/SklearnTrainingMultiLayerPerceptron.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingMultinomialNaiveBayes.png b/frontend/src/assets/operator_images/SklearnTrainingMultinomialNaiveBayes.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingMultinomialNaiveBayes.png
rename to frontend/src/assets/operator_images/SklearnTrainingMultinomialNaiveBayes.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingNearestCentroid.png b/frontend/src/assets/operator_images/SklearnTrainingNearestCentroid.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingNearestCentroid.png
rename to frontend/src/assets/operator_images/SklearnTrainingNearestCentroid.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingPassiveAggressive.png b/frontend/src/assets/operator_images/SklearnTrainingPassiveAggressive.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingPassiveAggressive.png
rename to frontend/src/assets/operator_images/SklearnTrainingPassiveAggressive.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingPerceptron.png b/frontend/src/assets/operator_images/SklearnTrainingPerceptron.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingPerceptron.png
rename to frontend/src/assets/operator_images/SklearnTrainingPerceptron.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingProbabilityCalibration.png b/frontend/src/assets/operator_images/SklearnTrainingProbabilityCalibration.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingProbabilityCalibration.png
rename to frontend/src/assets/operator_images/SklearnTrainingProbabilityCalibration.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingRandomForest.png b/frontend/src/assets/operator_images/SklearnTrainingRandomForest.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingRandomForest.png
rename to frontend/src/assets/operator_images/SklearnTrainingRandomForest.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingRidge.png b/frontend/src/assets/operator_images/SklearnTrainingRidge.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingRidge.png
rename to frontend/src/assets/operator_images/SklearnTrainingRidge.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingRidgeCV.png b/frontend/src/assets/operator_images/SklearnTrainingRidgeCV.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingRidgeCV.png
rename to frontend/src/assets/operator_images/SklearnTrainingRidgeCV.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingSDG.png b/frontend/src/assets/operator_images/SklearnTrainingSDG.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingSDG.png
rename to frontend/src/assets/operator_images/SklearnTrainingSDG.png
diff --git a/core/gui/src/assets/operator_images/SklearnTrainingSVM.png b/frontend/src/assets/operator_images/SklearnTrainingSVM.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SklearnTrainingSVM.png
rename to frontend/src/assets/operator_images/SklearnTrainingSVM.png
diff --git a/core/gui/src/assets/operator_images/Sleep.png b/frontend/src/assets/operator_images/Sleep.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Sleep.png
rename to frontend/src/assets/operator_images/Sleep.png
diff --git a/core/gui/src/assets/operator_images/Sort.png b/frontend/src/assets/operator_images/Sort.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Sort.png
rename to frontend/src/assets/operator_images/Sort.png
diff --git a/core/gui/src/assets/operator_images/SortPartitions.png b/frontend/src/assets/operator_images/SortPartitions.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SortPartitions.png
rename to frontend/src/assets/operator_images/SortPartitions.png
diff --git a/core/gui/src/assets/operator_images/Split.png b/frontend/src/assets/operator_images/Split.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Split.png
rename to frontend/src/assets/operator_images/Split.png
diff --git a/frontend/src/assets/operator_images/StableMergeSort.png b/frontend/src/assets/operator_images/StableMergeSort.png
new file mode 100644
index 00000000000..bf9ec5632d8
Binary files /dev/null and b/frontend/src/assets/operator_images/StableMergeSort.png differ
diff --git a/frontend/src/assets/operator_images/StripChart.png b/frontend/src/assets/operator_images/StripChart.png
new file mode 100644
index 00000000000..d363bc2180d
Binary files /dev/null and b/frontend/src/assets/operator_images/StripChart.png differ
diff --git a/frontend/src/assets/operator_images/SubstringSearch.png b/frontend/src/assets/operator_images/SubstringSearch.png
new file mode 100644
index 00000000000..ea571c3956c
Binary files /dev/null and b/frontend/src/assets/operator_images/SubstringSearch.png differ
diff --git a/core/gui/src/assets/operator_images/SymmetricDifference.png b/frontend/src/assets/operator_images/SymmetricDifference.png
similarity index 100%
rename from core/gui/src/assets/operator_images/SymmetricDifference.png
rename to frontend/src/assets/operator_images/SymmetricDifference.png
diff --git a/core/gui/src/assets/operator_images/TablesPlot.png b/frontend/src/assets/operator_images/TablesPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TablesPlot.png
rename to frontend/src/assets/operator_images/TablesPlot.png
diff --git a/core/gui/src/assets/operator_images/TernaryPlot.png b/frontend/src/assets/operator_images/TernaryPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TernaryPlot.png
rename to frontend/src/assets/operator_images/TernaryPlot.png
diff --git a/core/gui/src/assets/operator_images/TextInput.png b/frontend/src/assets/operator_images/TextInput.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TextInput.png
rename to frontend/src/assets/operator_images/TextInput.png
diff --git a/core/gui/src/assets/operator_images/TimeSeries.png b/frontend/src/assets/operator_images/TimeSeries.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TimeSeries.png
rename to frontend/src/assets/operator_images/TimeSeries.png
diff --git a/core/gui/src/assets/operator_images/TimeSeriesPlot.png b/frontend/src/assets/operator_images/TimeSeriesPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TimeSeriesPlot.png
rename to frontend/src/assets/operator_images/TimeSeriesPlot.png
diff --git a/core/gui/src/assets/operator_images/ToLowerCase.png b/frontend/src/assets/operator_images/ToLowerCase.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ToLowerCase.png
rename to frontend/src/assets/operator_images/ToLowerCase.png
diff --git a/core/gui/src/assets/operator_images/TreePlot.png b/frontend/src/assets/operator_images/TreePlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TreePlot.png
rename to frontend/src/assets/operator_images/TreePlot.png
diff --git a/core/gui/src/assets/operator_images/TwitterConverter.png b/frontend/src/assets/operator_images/TwitterConverter.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TwitterConverter.png
rename to frontend/src/assets/operator_images/TwitterConverter.png
diff --git a/core/gui/src/assets/operator_images/TwitterFeed.png b/frontend/src/assets/operator_images/TwitterFeed.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TwitterFeed.png
rename to frontend/src/assets/operator_images/TwitterFeed.png
diff --git a/core/gui/src/assets/operator_images/TwitterFullArchiveSearch.png b/frontend/src/assets/operator_images/TwitterFullArchiveSearch.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TwitterFullArchiveSearch.png
rename to frontend/src/assets/operator_images/TwitterFullArchiveSearch.png
diff --git a/core/gui/src/assets/operator_images/TwitterSearch.png b/frontend/src/assets/operator_images/TwitterSearch.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TwitterSearch.png
rename to frontend/src/assets/operator_images/TwitterSearch.png
diff --git a/core/gui/src/assets/operator_images/TypeCasting.png b/frontend/src/assets/operator_images/TypeCasting.png
similarity index 100%
rename from core/gui/src/assets/operator_images/TypeCasting.png
rename to frontend/src/assets/operator_images/TypeCasting.png
diff --git a/core/gui/src/assets/operator_images/URLFetcher.png b/frontend/src/assets/operator_images/URLFetcher.png
similarity index 100%
rename from core/gui/src/assets/operator_images/URLFetcher.png
rename to frontend/src/assets/operator_images/URLFetcher.png
diff --git a/core/gui/src/assets/operator_images/URLVisualizer.png b/frontend/src/assets/operator_images/URLVisualizer.png
similarity index 100%
rename from core/gui/src/assets/operator_images/URLVisualizer.png
rename to frontend/src/assets/operator_images/URLVisualizer.png
diff --git a/core/gui/src/assets/operator_images/Union.png b/frontend/src/assets/operator_images/Union.png
similarity index 100%
rename from core/gui/src/assets/operator_images/Union.png
rename to frontend/src/assets/operator_images/Union.png
diff --git a/core/gui/src/assets/operator_images/UnnestString.png b/frontend/src/assets/operator_images/UnnestString.png
similarity index 100%
rename from core/gui/src/assets/operator_images/UnnestString.png
rename to frontend/src/assets/operator_images/UnnestString.png
diff --git a/core/gui/src/assets/operator_images/ViewResults.png b/frontend/src/assets/operator_images/ViewResults.png
similarity index 100%
rename from core/gui/src/assets/operator_images/ViewResults.png
rename to frontend/src/assets/operator_images/ViewResults.png
diff --git a/core/gui/src/assets/operator_images/VolcanoPlot.png b/frontend/src/assets/operator_images/VolcanoPlot.png
similarity index 100%
rename from core/gui/src/assets/operator_images/VolcanoPlot.png
rename to frontend/src/assets/operator_images/VolcanoPlot.png
diff --git a/core/gui/src/assets/operator_images/WaterfallChart.png b/frontend/src/assets/operator_images/WaterfallChart.png
similarity index 100%
rename from core/gui/src/assets/operator_images/WaterfallChart.png
rename to frontend/src/assets/operator_images/WaterfallChart.png
diff --git a/core/gui/src/assets/operator_images/WordCloud.png b/frontend/src/assets/operator_images/WordCloud.png
similarity index 100%
rename from core/gui/src/assets/operator_images/WordCloud.png
rename to frontend/src/assets/operator_images/WordCloud.png
diff --git a/core/gui/src/assets/operator_images/WordCloudV2.png b/frontend/src/assets/operator_images/WordCloudV2.png
similarity index 100%
rename from core/gui/src/assets/operator_images/WordCloudV2.png
rename to frontend/src/assets/operator_images/WordCloudV2.png
diff --git a/core/gui/src/assets/operator_images/WordCount.png b/frontend/src/assets/operator_images/WordCount.png
similarity index 100%
rename from core/gui/src/assets/operator_images/WordCount.png
rename to frontend/src/assets/operator_images/WordCount.png
diff --git a/core/gui/src/assets/operator_images/WordCountIndexSource.png b/frontend/src/assets/operator_images/WordCountIndexSource.png
similarity index 100%
rename from core/gui/src/assets/operator_images/WordCountIndexSource.png
rename to frontend/src/assets/operator_images/WordCountIndexSource.png
diff --git a/core/gui/src/assets/operator_images/icons8-chat_bubble.png b/frontend/src/assets/operator_images/icons8-chat_bubble.png
similarity index 100%
rename from core/gui/src/assets/operator_images/icons8-chat_bubble.png
rename to frontend/src/assets/operator_images/icons8-chat_bubble.png
diff --git a/core/gui/src/assets/operator_images/run-icon.png b/frontend/src/assets/operator_images/run-icon.png
similarity index 100%
rename from core/gui/src/assets/operator_images/run-icon.png
rename to frontend/src/assets/operator_images/run-icon.png
diff --git a/core/gui/src/assets/svg/hub_icon.svg b/frontend/src/assets/svg/hub_icon.svg
similarity index 99%
rename from core/gui/src/assets/svg/hub_icon.svg
rename to frontend/src/assets/svg/hub_icon.svg
index 2be5a497ff9..0c9a299c5d3 100644
--- a/core/gui/src/assets/svg/hub_icon.svg
+++ b/frontend/src/assets/svg/hub_icon.svg
@@ -18,16 +18,16 @@
 -->
 
 <svg
-   version="1.1"
-   id="svg2"
-   width="666.66669"
-   height="533.33331"
-   viewBox="0 0 666.66669 533.33331"
-   sodipodi:docname="492_dGlueSBwZW9wbGUgc2hhcmUgY29uY2VwdCBtb25vXzA4LjA0LjI0.eps"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+  version="1.1"
+  id="svg2"
+  width="666.66669"
+  height="533.33331"
+  viewBox="0 0 666.66669 533.33331"
+  sodipodi:docname="492_dGlueSBwZW9wbGUgc2hhcmUgY29uY2VwdCBtb25vXzA4LjA0LjI0.eps"
+  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+  xmlns="http://www.w3.org/2000/svg"
+>
   <defs
      id="defs6" />
   <sodipodi:namedview
diff --git a/core/gui/src/assets/svg/operator-reuse-cache-invalid.svg b/frontend/src/assets/svg/operator-reuse-cache-invalid.svg
similarity index 86%
rename from core/gui/src/assets/svg/operator-reuse-cache-invalid.svg
rename to frontend/src/assets/svg/operator-reuse-cache-invalid.svg
index a7879568b15..3a39cd6ec35 100644
--- a/core/gui/src/assets/svg/operator-reuse-cache-invalid.svg
+++ b/frontend/src/assets/svg/operator-reuse-cache-invalid.svg
@@ -17,6 +17,7 @@
   under the License.
 -->
 
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 125" style="enable-background:new 0 0 100 100;" xml:space="preserve"><style type="text/css">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 100 125"
+     style="enable-background:new 0 0 100 100;" xml:space="preserve"><style type="text/css">
 	.st0{fill:none;stroke:#000000;stroke-width:5;stroke-miterlimit:10;}
 </style><g><g><path d="M50,22.5c-15.2,0-27.5,12.3-27.5,27.5S34.8,77.5,50,77.5S77.5,65.2,77.5,50S65.2,22.5,50,22.5z M50,72.5    c-12.4,0-22.5-10.1-22.5-22.5S37.6,27.5,50,27.5S72.5,37.6,72.5,50S62.4,72.5,50,72.5z"/><path d="M56.5,37.5h-13c-1.4,0-2.5,1.1-2.5,2.5s1.1,2.5,2.5,2.5h13c1.4,0,2.5-1.1,2.5-2.5S57.9,37.5,56.5,37.5z"/><path d="M56.5,47.5h-13c-1.4,0-2.5,1.1-2.5,2.5s1.1,2.5,2.5,2.5h13c1.4,0,2.5-1.1,2.5-2.5S57.9,47.5,56.5,47.5z"/><path d="M56.5,57.5h-13c-1.4,0-2.5,1.1-2.5,2.5s1.1,2.5,2.5,2.5h13c1.4,0,2.5-1.1,2.5-2.5S57.9,57.5,56.5,57.5z"/></g></g></svg>
diff --git a/core/gui/src/assets/svg/operator-reuse-cache-valid.svg b/frontend/src/assets/svg/operator-reuse-cache-valid.svg
similarity index 85%
rename from core/gui/src/assets/svg/operator-reuse-cache-valid.svg
rename to frontend/src/assets/svg/operator-reuse-cache-valid.svg
index 6a5e012137f..e1755e3b336 100644
--- a/core/gui/src/assets/svg/operator-reuse-cache-valid.svg
+++ b/frontend/src/assets/svg/operator-reuse-cache-valid.svg
@@ -17,6 +17,7 @@
   under the License.
 -->
 
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 125" style="enable-background:new 0 0 100 100;" xml:space="preserve"><style type="text/css">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 100 125"
+     style="enable-background:new 0 0 100 100;" xml:space="preserve"><style type="text/css">
 	.st0{fill:none;stroke:#000000;stroke-width:5;stroke-miterlimit:10;}
 </style><g><g><path d="M50,22.5c-15.2,0-27.5,12.3-27.5,27.5S34.8,77.5,50,77.5S77.5,65.2,77.5,50S65.2,22.5,50,22.5z M50,72.5    c-12.4,0-22.5-10.1-22.5-22.5S37.6,27.5,50,27.5S72.5,37.6,72.5,50S62.4,72.5,50,72.5z"/><path d="M58.2,41.6L46.7,53.1l-4.9-4.9c-1-1-2.6-1-3.5,0c-1,1-1,2.6,0,3.5l6.7,6.7c0.5,0.5,1.1,0.7,1.8,0.7s1.3-0.2,1.8-0.7    l13.3-13.3c1-1,1-2.6,0-3.5C60.8,40.6,59.2,40.6,58.2,41.6z"/></g></g></svg>
diff --git a/core/gui/src/assets/svg/operator-view-result.svg b/frontend/src/assets/svg/operator-view-result.svg
similarity index 100%
rename from core/gui/src/assets/svg/operator-view-result.svg
rename to frontend/src/assets/svg/operator-view-result.svg
diff --git a/core/gui/src/assets/texera_email_screenshot.png b/frontend/src/assets/texera_email_screenshot.png
similarity index 100%
rename from core/gui/src/assets/texera_email_screenshot.png
rename to frontend/src/assets/texera_email_screenshot.png
diff --git a/frontend/src/assets/workflow_gui.png b/frontend/src/assets/workflow_gui.png
new file mode 100644
index 00000000000..cb4348bd5b1
Binary files /dev/null and b/frontend/src/assets/workflow_gui.png differ
diff --git a/core/gui/src/environments/environment.default.ts b/frontend/src/environments/environment.default.ts
similarity index 80%
rename from core/gui/src/environments/environment.default.ts
rename to frontend/src/environments/environment.default.ts
index 3d3b512b2c5..1619ea480df 100644
--- a/core/gui/src/environments/environment.default.ts
+++ b/frontend/src/environments/environment.default.ts
@@ -18,8 +18,6 @@
 // The file contains the default environment template
 // it's used to store app settings and flags to turn on or off different features
 
-import { GuiConfig } from "../app/common/type/gui-config";
-
 // AppEnv extends GuiConfig with the build-time production flag
 export type AppEnv = {
   /**
@@ -31,10 +29,24 @@ export type AppEnv = {
    * root API URL of the backend
    */
   apiUrl: string;
+
+  /**
+   * API URL of the OpenAI Flask server (notebook migration tool)
+   */
+  notebookMigrationFastAPIUrl: string;
+
+  /**
+   * API URL of the Jupyter server (notebook migration tool)
+   */
+  jupyterAPIUrl: string;
 };
 
 export const defaultEnvironment: AppEnv = {
   production: false,
 
   apiUrl: "api",
+
+  notebookMigrationFastAPIUrl: "http://localhost:5000",
+
+  jupyterAPIUrl: "http://localhost:8889",
 };
diff --git a/core/gui/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
similarity index 100%
rename from core/gui/src/environments/environment.prod.ts
rename to frontend/src/environments/environment.prod.ts
diff --git a/core/gui/src/environments/environment.test.ts b/frontend/src/environments/environment.test.ts
similarity index 100%
rename from core/gui/src/environments/environment.test.ts
rename to frontend/src/environments/environment.test.ts
diff --git a/core/gui/src/environments/environment.ts b/frontend/src/environments/environment.ts
similarity index 100%
rename from core/gui/src/environments/environment.ts
rename to frontend/src/environments/environment.ts
diff --git a/core/gui/src/favicon.ico b/frontend/src/favicon.ico
similarity index 100%
rename from core/gui/src/favicon.ico
rename to frontend/src/favicon.ico
diff --git a/core/gui/src/index.html b/frontend/src/index.html
similarity index 100%
rename from core/gui/src/index.html
rename to frontend/src/index.html
diff --git a/core/gui/src/main.ts b/frontend/src/main.ts
similarity index 100%
rename from core/gui/src/main.ts
rename to frontend/src/main.ts
diff --git a/core/gui/src/styles.scss b/frontend/src/styles.scss
similarity index 98%
rename from core/gui/src/styles.scss
rename to frontend/src/styles.scss
index c0f39bf2f66..7ed7614d177 100644
--- a/core/gui/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -19,6 +19,10 @@
 
 @import "@ali-hm/angular-tree-component/css/angular-tree-component.css";
 
+* {
+  user-select: none;
+}
+
 .ant-image-preview-img {
   width: 50%;
   height: 60%;
diff --git a/core/gui/src/test.ts b/frontend/src/test.ts
similarity index 100%
rename from core/gui/src/test.ts
rename to frontend/src/test.ts
diff --git a/core/gui/src/tsconfig.app.json b/frontend/src/tsconfig.app.json
similarity index 100%
rename from core/gui/src/tsconfig.app.json
rename to frontend/src/tsconfig.app.json
diff --git a/core/gui/src/tsconfig.spec.json b/frontend/src/tsconfig.spec.json
similarity index 100%
rename from core/gui/src/tsconfig.spec.json
rename to frontend/src/tsconfig.spec.json
diff --git a/core/gui/tsconfig.json b/frontend/tsconfig.json
similarity index 93%
rename from core/gui/tsconfig.json
rename to frontend/tsconfig.json
index 6753cba7fea..8e06ca22074 100644
--- a/core/gui/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
     "paths": {
       "path": ["./node_modules/path-browserify"]
     },
diff --git a/core/gui/yarn.lock b/frontend/yarn.lock
similarity index 97%
rename from core/gui/yarn.lock
rename to frontend/yarn.lock
index fc89615df4d..910cc1b5f6d 100644
--- a/core/gui/yarn.lock
+++ b/frontend/yarn.lock
@@ -24,6 +24,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ai-sdk/gateway@npm:2.0.9":
+  version: 2.0.9
+  resolution: "@ai-sdk/gateway@npm:2.0.9"
+  dependencies:
+    "@ai-sdk/provider": "npm:2.0.0"
+    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@vercel/oidc": "npm:3.0.3"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/840f94795b96c0fa6e73897ea8dba95fc78af1f8482f3b7d8439b6233b4f4de6979a8b67206f4bbf32649baf2acfb1153a46792dfa20259ca9f5fd214fb25fa5
+  languageName: node
+  linkType: hard
+
+"@ai-sdk/openai@npm:2.0.67":
+  version: 2.0.67
+  resolution: "@ai-sdk/openai@npm:2.0.67"
+  dependencies:
+    "@ai-sdk/provider": "npm:2.0.0"
+    "@ai-sdk/provider-utils": "npm:3.0.17"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/7e5c407504d7902c17c816aaccd83f642a3b82012cd8467c8f58aef5f08a49b6c31fff775439d541d40b0c8b5b94cc384f18096d1968e23670e22a56fe82d8bd
+  languageName: node
+  linkType: hard
+
+"@ai-sdk/provider-utils@npm:3.0.17":
+  version: 3.0.17
+  resolution: "@ai-sdk/provider-utils@npm:3.0.17"
+  dependencies:
+    "@ai-sdk/provider": "npm:2.0.0"
+    "@standard-schema/spec": "npm:^1.0.0"
+    eventsource-parser: "npm:^3.0.6"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/1bae6dc4cacd0305b6aa152f9589bbd61c29f150155482c285a77f83d7ed416d52bc2aa7fdaba2e5764530392d9e8f799baea34a63dce6c72ecd3de364dc62d1
+  languageName: node
+  linkType: hard
+
+"@ai-sdk/provider@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@ai-sdk/provider@npm:2.0.0"
+  dependencies:
+    json-schema: "npm:^0.4.0"
+  checksum: 10c0/e50e520016c9fc0a8b5009cadd47dae2f1c81ec05c1792b9e312d7d15479f024ca8039525813a33425c884e3449019fed21043b1bfabd6a2626152ca9a388199
+  languageName: node
+  linkType: hard
+
 "@ali-hm/angular-tree-component@npm:12.0.5":
   version: 12.0.5
   resolution: "@ali-hm/angular-tree-component@npm:12.0.5"
@@ -711,6 +758,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.27.1":
+  version: 7.27.1
+  resolution: "@babel/code-frame@npm:7.27.1"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.27.1"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.1.1"
+  checksum: 10c0/5dd9a18baa5fce4741ba729acc3a3272c49c25cb8736c4b18e113099520e7ef7b545a4096a26d600e4416157e63e87d66db46aa3fbf0a5f2286da2705c12da00
+  languageName: node
+  linkType: hard
+
 "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.25.7, @babel/compat-data@npm:^7.25.8":
   version: 7.25.8
   resolution: "@babel/compat-data@npm:7.25.8"
@@ -1048,6 +1106,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.27.1":
+  version: 7.27.1
+  resolution: "@babel/helper-string-parser@npm:7.27.1"
+  checksum: 10c0/8bda3448e07b5583727c103560bcf9c4c24b3c1051a4c516d4050ef69df37bb9a4734a585fe12725b8c2763de0a265aa1e909b485a4e3270b7cfd3e4dbe4b602
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/helper-validator-identifier@npm:7.25.7"
@@ -1055,6 +1120,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.27.1":
+  version: 7.27.1
+  resolution: "@babel/helper-validator-identifier@npm:7.27.1"
+  checksum: 10c0/c558f11c4871d526498e49d07a84752d1800bf72ac0d3dad100309a2eaba24efbf56ea59af5137ff15e3a00280ebe588560534b0e894a4750f8b1411d8f78b84
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.22.5, @babel/helper-validator-option@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/helper-validator-option@npm:7.25.7"
@@ -1074,12 +1146,12 @@ __metadata:
   linkType: hard
 
 "@babel/helpers@npm:^7.22.6, @babel/helpers@npm:^7.23.2, @babel/helpers@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helpers@npm:7.25.7"
+  version: 7.28.4
+  resolution: "@babel/helpers@npm:7.28.4"
   dependencies:
-    "@babel/template": "npm:^7.25.7"
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10c0/3b3ae9e373bd785414195ef8f59976a69d5a6ebe0ef2165fdcc5165e5c3ee09e0fcee94bb457df2ddb8c0532e4146d0a9b7a96b3497399a4bff4ffe196b30228
+    "@babel/template": "npm:^7.27.2"
+    "@babel/types": "npm:^7.28.4"
+  checksum: 10c0/aaa5fb8098926dfed5f223adf2c5e4c7fbba4b911b73dfec2d7d3083f8ba694d201a206db673da2d9b3ae8c01793e795767654558c450c8c14b4c2175b4fcb44
   languageName: node
   linkType: hard
 
@@ -1106,6 +1178,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.27.2":
+  version: 7.28.4
+  resolution: "@babel/parser@npm:7.28.4"
+  dependencies:
+    "@babel/types": "npm:^7.28.4"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10c0/58b239a5b1477ac7ed7e29d86d675cc81075ca055424eba6485872626db2dc556ce63c45043e5a679cd925e999471dba8a3ed4864e7ab1dbf64306ab72c52707
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.7"
@@ -2333,6 +2416,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.27.2":
+  version: 7.27.2
+  resolution: "@babel/template@npm:7.27.2"
+  dependencies:
+    "@babel/code-frame": "npm:^7.27.1"
+    "@babel/parser": "npm:^7.27.2"
+    "@babel/types": "npm:^7.27.1"
+  checksum: 10c0/ed9e9022651e463cc5f2cc21942f0e74544f1754d231add6348ff1b472985a3b3502041c0be62dc99ed2d12cfae0c51394bf827452b98a2f8769c03b87aadc81
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.10.3, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/traverse@npm:7.25.7"
@@ -2359,6 +2453,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.27.1, @babel/types@npm:^7.28.4":
+  version: 7.28.4
+  resolution: "@babel/types@npm:7.28.4"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.27.1"
+    "@babel/helper-validator-identifier": "npm:^7.27.1"
+  checksum: 10c0/ac6f909d6191319e08c80efbfac7bd9a25f80cc83b43cd6d82e7233f7a6b9d6e7b90236f3af7400a3f83b576895bcab9188a22b584eb0f224e80e6d4e95f4517
+  languageName: node
+  linkType: hard
+
 "@braintree/sanitize-url@npm:^6.0.0":
   version: 6.0.4
   resolution: "@braintree/sanitize-url@npm:6.0.4"
@@ -4541,6 +4645,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/api@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@opentelemetry/api@npm:1.9.0"
+  checksum: 10c0/9aae2fe6e8a3a3eeb6c1fdef78e1939cf05a0f37f8a4fae4d6bf2e09eb1e06f966ece85805626e01ba5fab48072b94f19b835449e58b6d26720ee19a58298add
+  languageName: node
+  linkType: hard
+
 "@parcel/watcher-android-arm64@npm:2.4.1":
   version: 2.4.1
   resolution: "@parcel/watcher-android-arm64@npm:2.4.1"
@@ -4859,6 +4970,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@standard-schema/spec@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@standard-schema/spec@npm:1.0.0"
+  checksum: 10c0/a1ab9a8bdc09b5b47aa8365d0e0ec40cc2df6437be02853696a0e377321653b0d3ac6f079a8c67d5ddbe9821025584b1fb71d9cc041a6666a96f1fadf2ece15f
+  languageName: node
+  linkType: hard
+
 "@stoplight/json-ref-resolver@npm:3.1.5":
   version: 3.1.5
   resolution: "@stoplight/json-ref-resolver@npm:3.1.5"
@@ -5019,6 +5137,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/concaveman@npm:1.1.6":
+  version: 1.1.6
+  resolution: "@types/concaveman@npm:1.1.6"
+  checksum: 10c0/5cc36f8d85eeb15e976d4592c0cffca42607d1de14180fc15d5518fd309a714f05fcf9ecf03f43432fd014905aa78801a4004773ce00293424263738467e65da
+  languageName: node
+  linkType: hard
+
 "@types/connect-history-api-fallback@npm:^1.3.5, @types/connect-history-api-fallback@npm:^1.5.4":
   version: 1.5.4
   resolution: "@types/connect-history-api-fallback@npm:1.5.4"
@@ -5061,6 +5186,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/d3-path@npm:^2":
+  version: 2.0.4
+  resolution: "@types/d3-path@npm:2.0.4"
+  checksum: 10c0/82214a9644cfffe0c1f9a7aab00e3912aaba89115c60d94ecf716d282eac71671761962a9e911a8ebc457777e3db42f80c355b61010e5e27218f6aed32128d39
+  languageName: node
+  linkType: hard
+
+"@types/d3-shape@npm:2.1.2":
+  version: 2.1.2
+  resolution: "@types/d3-shape@npm:2.1.2"
+  dependencies:
+    "@types/d3-path": "npm:^2"
+  checksum: 10c0/f32e49cc41089ba9658716e14626831b20f564ac95be9a363fbd119913e223aa771dd703a2a602a2db8f25ba2eada1a73c12c2cff057526e0c3f9519756e5a4c
+  languageName: node
+  linkType: hard
+
 "@types/dagre@npm:0.7.47":
   version: 0.7.47
   resolution: "@types/dagre@npm:0.7.47"
@@ -5847,6 +5988,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vercel/oidc@npm:3.0.3":
+  version: 3.0.3
+  resolution: "@vercel/oidc@npm:3.0.3"
+  checksum: 10c0/c8eecb1324559435f4ab8a955f5ef44f74f546d11c2ddcf28151cb636d989bd4b34e0673fd8716cb21bb21afb34b3de663bacc30c9506036eeecbcbf2fd86241
+  languageName: node
+  linkType: hard
+
 "@vitejs/plugin-basic-ssl@npm:1.0.1":
   version: 1.0.1
   resolution: "@vitejs/plugin-basic-ssl@npm:1.0.1"
@@ -6268,6 +6416,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ai@npm:5.0.93":
+  version: 5.0.93
+  resolution: "ai@npm:5.0.93"
+  dependencies:
+    "@ai-sdk/gateway": "npm:2.0.9"
+    "@ai-sdk/provider": "npm:2.0.0"
+    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@opentelemetry/api": "npm:1.9.0"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/64e80a36248ef20d42a0e688a58da6ca4255e2510a47d6ee9c2318a669df8e8ffb5c63ddb03a3cadd841058414bd4b324783f168c761f82421e4a1c2ac958933
+  languageName: node
+  linkType: hard
+
 "ajv-formats@npm:2.1.1, ajv-formats@npm:^2.1.1":
   version: 2.1.1
   resolution: "ajv-formats@npm:2.1.1"
@@ -7028,12 +7190,12 @@ __metadata:
   linkType: hard
 
 "brace-expansion@npm:^1.1.7":
-  version: 1.1.11
-  resolution: "brace-expansion@npm:1.1.11"
+  version: 1.1.12
+  resolution: "brace-expansion@npm:1.1.12"
   dependencies:
     balanced-match: "npm:^1.0.0"
     concat-map: "npm:0.0.1"
-  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+  checksum: 10c0/975fecac2bb7758c062c20d0b3b6288c7cc895219ee25f0a64a9de662dbac981ff0b6e89909c3897c1f84fa353113a721923afdec5f8b2350255b097f12b1f73
   languageName: node
   linkType: hard
 
@@ -7629,6 +7791,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:2, commander@npm:^2.20.0":
+  version: 2.20.3
+  resolution: "commander@npm:2.20.3"
+  checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
+  languageName: node
+  linkType: hard
+
 "commander@npm:7, commander@npm:^7.2.0":
   version: 7.2.0
   resolution: "commander@npm:7.2.0"
@@ -7636,13 +7805,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^2.20.0":
-  version: 2.20.3
-  resolution: "commander@npm:2.20.3"
-  checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
-  languageName: node
-  linkType: hard
-
 "commander@npm:^8.3.0":
   version: 8.3.0
   resolution: "commander@npm:8.3.0"
@@ -7709,6 +7871,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"concaveman@npm:2.0.0":
+  version: 2.0.0
+  resolution: "concaveman@npm:2.0.0"
+  dependencies:
+    point-in-polygon: "npm:^1.1.0"
+    rbush: "npm:^4.0.1"
+    robust-predicates: "npm:^3.0.2"
+    tinyqueue: "npm:^3.0.0"
+  checksum: 10c0/d277ee4dd5e5af21f0a22d056e1edad66db8f5515a9feb92d95f40407d819c17a0b4cd7f5a07a028d72cac05e85305dee0118036bc295424740f01af08ecda98
+  languageName: node
+  linkType: hard
+
 "concurrently@npm:7.4.0":
   version: 7.4.0
   resolution: "concurrently@npm:7.4.0"
@@ -8276,6 +8450,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-array@npm:2, d3-array@npm:^2.3.0, d3-array@npm:^2.5.0":
+  version: 2.12.1
+  resolution: "d3-array@npm:2.12.1"
+  dependencies:
+    internmap: "npm:^1.0.0"
+  checksum: 10c0/7eca10427a9f113a4ca6a0f7301127cab26043fd5e362631ef5a0edd1c4b2dd70c56ed317566700c31e4a6d88b55f3951aaba192291817f243b730cb2352882e
+  languageName: node
+  linkType: hard
+
+"d3-axis@npm:2":
+  version: 2.1.0
+  resolution: "d3-axis@npm:2.1.0"
+  checksum: 10c0/812558c0a016f8541e4704837b4428060695e2397e00a374caab5ae060a8ea6254bb097a4cfb7e01deff61da8a91c582eda614659ada5fd590da902a397428cc
+  languageName: node
+  linkType: hard
+
 "d3-axis@npm:3":
   version: 3.0.0
   resolution: "d3-axis@npm:3.0.0"
@@ -8283,6 +8473,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-brush@npm:2":
+  version: 2.1.0
+  resolution: "d3-brush@npm:2.1.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 2"
+    d3-drag: "npm:2"
+    d3-interpolate: "npm:1 - 2"
+    d3-selection: "npm:2"
+    d3-transition: "npm:2"
+  checksum: 10c0/f4221f815f8b0fb5af42a2c5baf7cb884067fdddfe5e3d9ae8b603912a47c205e138b8cdcb19a693feac46aa790c0dc9204c893e4b09cfdb944d31bde0b81126
+  languageName: node
+  linkType: hard
+
 "d3-brush@npm:3":
   version: 3.0.0
   resolution: "d3-brush@npm:3.0.0"
@@ -8296,6 +8499,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-chord@npm:2":
+  version: 2.0.0
+  resolution: "d3-chord@npm:2.0.0"
+  dependencies:
+    d3-path: "npm:1 - 2"
+  checksum: 10c0/675c4941cd9ea8dcf462622409a42b5de4120198b5016bf9a13e67074487b30a29ab5b7adbae3cab6ee56820255c320a56657fdf55538c4c7439cb9a4248dbb4
+  languageName: node
+  linkType: hard
+
 "d3-chord@npm:3":
   version: 3.0.1
   resolution: "d3-chord@npm:3.0.1"
@@ -8305,6 +8517,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-color@npm:1 - 2, d3-color@npm:2":
+  version: 2.0.0
+  resolution: "d3-color@npm:2.0.0"
+  checksum: 10c0/5aa58dfb78e3db764373a904eabb643dc024ff6071128a41e86faafa100e0e17a796e06ac3f2662e9937242bb75b8286788629773d76936f11c17bd5fe5e15cd
+  languageName: node
+  linkType: hard
+
 "d3-color@npm:1 - 3, d3-color@npm:3":
   version: 3.1.0
   resolution: "d3-color@npm:3.1.0"
@@ -8312,6 +8531,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-contour@npm:2":
+  version: 2.0.0
+  resolution: "d3-contour@npm:2.0.0"
+  dependencies:
+    d3-array: "npm:2"
+  checksum: 10c0/00b58abff5648438928571efc75a56e7459edcbb63ad807bcb38de13b337ac4a83286dabe33f53562ee5ebd2d83da31835cf46a1775fe35e03101772769d10ac
+  languageName: node
+  linkType: hard
+
 "d3-contour@npm:4":
   version: 4.0.2
   resolution: "d3-contour@npm:4.0.2"
@@ -8321,6 +8549,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-delaunay@npm:5":
+  version: 5.3.0
+  resolution: "d3-delaunay@npm:5.3.0"
+  dependencies:
+    delaunator: "npm:4"
+  checksum: 10c0/214aaddd01c58cadcfeea917ff7b7c3202083ac66fe5948d14558385d1ce495b33498ce10a3188ff144377d3da2f2ad72c2c3885407c325a24266c8f4c09347e
+  languageName: node
+  linkType: hard
+
 "d3-delaunay@npm:6":
   version: 6.0.4
   resolution: "d3-delaunay@npm:6.0.4"
@@ -8330,6 +8567,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-dispatch@npm:1 - 2, d3-dispatch@npm:2":
+  version: 2.0.0
+  resolution: "d3-dispatch@npm:2.0.0"
+  checksum: 10c0/379f7ce1510f529da00a34016630e92e41c0f6bbffef7b849f4e46733c188c67418df266a9a541cda17572b5286e32fbaf66308fe04dcfe52aa551830825bc93
+  languageName: node
+  linkType: hard
+
 "d3-dispatch@npm:1 - 3, d3-dispatch@npm:3":
   version: 3.0.1
   resolution: "d3-dispatch@npm:3.0.1"
@@ -8337,6 +8581,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-drag@npm:2":
+  version: 2.0.0
+  resolution: "d3-drag@npm:2.0.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 2"
+    d3-selection: "npm:2"
+  checksum: 10c0/a6f2cfea47aa888b56476454554b37befb0d332f326704913142c6a89b295edfc0947a9fb5afdd0c6d0028878b832a975c80df55d009ab7ccf7b59faa99e926c
+  languageName: node
+  linkType: hard
+
 "d3-drag@npm:2 - 3, d3-drag@npm:3":
   version: 3.0.0
   resolution: "d3-drag@npm:3.0.0"
@@ -8347,6 +8601,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-dsv@npm:1 - 2, d3-dsv@npm:2":
+  version: 2.0.0
+  resolution: "d3-dsv@npm:2.0.0"
+  dependencies:
+    commander: "npm:2"
+    iconv-lite: "npm:0.4"
+    rw: "npm:1"
+  bin:
+    csv2json: bin/dsv2json
+    csv2tsv: bin/dsv2dsv
+    dsv2dsv: bin/dsv2dsv
+    dsv2json: bin/dsv2json
+    json2csv: bin/json2dsv
+    json2dsv: bin/json2dsv
+    json2tsv: bin/json2dsv
+    tsv2csv: bin/dsv2dsv
+    tsv2json: bin/dsv2json
+  checksum: 10c0/b5e4a0945664a941ad37d3c5ee8c8cbb3c99712ff7f36b2420446ebfc3b3909eb3d9ef2682b4a77afa6a6c5f5af1d659e17d6678863d95b244aed479b6c7c5c3
+  languageName: node
+  linkType: hard
+
 "d3-dsv@npm:1 - 3, d3-dsv@npm:3":
   version: 3.0.1
   resolution: "d3-dsv@npm:3.0.1"
@@ -8368,6 +8643,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-ease@npm:1 - 2, d3-ease@npm:2":
+  version: 2.0.0
+  resolution: "d3-ease@npm:2.0.0"
+  checksum: 10c0/4c2e74417739b73f5d185675be0a72b19df1f729b87c457d4b13976f7eef5c1f54739b4ccd71d9730521c959cfac28a56f5f4040dd2baf5729ac7e4adce344f1
+  languageName: node
+  linkType: hard
+
 "d3-ease@npm:1 - 3, d3-ease@npm:3":
   version: 3.0.1
   resolution: "d3-ease@npm:3.0.1"
@@ -8375,6 +8657,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-fetch@npm:2":
+  version: 2.0.0
+  resolution: "d3-fetch@npm:2.0.0"
+  dependencies:
+    d3-dsv: "npm:1 - 2"
+  checksum: 10c0/c508e1fb9d0aa04af04d8021a658ce2726239c265ffe0762d9fda3f02a1d1958d87984b486a41141660f61258f5977deff84d87767422876aed12dca3407bf73
+  languageName: node
+  linkType: hard
+
 "d3-fetch@npm:3":
   version: 3.0.1
   resolution: "d3-fetch@npm:3.0.1"
@@ -8384,6 +8675,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-force@npm:2":
+  version: 2.1.1
+  resolution: "d3-force@npm:2.1.1"
+  dependencies:
+    d3-dispatch: "npm:1 - 2"
+    d3-quadtree: "npm:1 - 2"
+    d3-timer: "npm:1 - 2"
+  checksum: 10c0/0044ad969c524fa32d39d414fb698d183a10b7a9ec9369ac04aa00cc026bc1262308971d70bf20873adfb3d73f557aea9203797d40bd7d7247ed9714be946fb4
+  languageName: node
+  linkType: hard
+
 "d3-force@npm:3":
   version: 3.0.0
   resolution: "d3-force@npm:3.0.0"
@@ -8395,6 +8697,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-format@npm:1 - 2, d3-format@npm:2":
+  version: 2.0.0
+  resolution: "d3-format@npm:2.0.0"
+  checksum: 10c0/c869af459e20767dc3d9cbb2946ba79cc266ae4fb35d11c50c63fc89ea4ed168c702c7e3db94d503b3618de9609bf3bf2d855ef53e21109ddd7eb9c8f3fcf8a1
+  languageName: node
+  linkType: hard
+
 "d3-format@npm:1 - 3, d3-format@npm:3":
   version: 3.1.0
   resolution: "d3-format@npm:3.1.0"
@@ -8402,6 +8711,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-geo@npm:2":
+  version: 2.0.2
+  resolution: "d3-geo@npm:2.0.2"
+  dependencies:
+    d3-array: "npm:^2.5.0"
+  checksum: 10c0/6836feb33036f03ec1dc728d64171f3eb40ee2c1c0f2e28232055aa317e5e2d481075294babb9553596e2080496eda119b8a43c51f71c893e6258ccf002bd7f8
+  languageName: node
+  linkType: hard
+
 "d3-geo@npm:3":
   version: 3.1.1
   resolution: "d3-geo@npm:3.1.1"
@@ -8411,6 +8729,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-hierarchy@npm:2":
+  version: 2.0.0
+  resolution: "d3-hierarchy@npm:2.0.0"
+  checksum: 10c0/3216f9b8537ae2bf331006630f2075a81df4943edff077a60e19ca6f9a619c8494bf45bf7d89b409160b49edd1a49c0050002cdc8a9ae6e3672d20018a821fac
+  languageName: node
+  linkType: hard
+
 "d3-hierarchy@npm:3":
   version: 3.1.2
   resolution: "d3-hierarchy@npm:3.1.2"
@@ -8418,6 +8743,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-interpolate@npm:1 - 2, d3-interpolate@npm:1.2.0 - 2, d3-interpolate@npm:2":
+  version: 2.0.1
+  resolution: "d3-interpolate@npm:2.0.1"
+  dependencies:
+    d3-color: "npm:1 - 2"
+  checksum: 10c0/2a5725b0c9c7fef3e8878cf75ad67be851b1472de3dda1f694c441786a1a32e198ddfaa6880d6b280401c1af5b844b61ccdd63d85d1607c1e6bb3a3f0bf532ea
+  languageName: node
+  linkType: hard
+
 "d3-interpolate@npm:1 - 3, d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:3":
   version: 3.0.1
   resolution: "d3-interpolate@npm:3.0.1"
@@ -8427,6 +8761,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-path@npm:1 - 2, d3-path@npm:2":
+  version: 2.0.0
+  resolution: "d3-path@npm:2.0.0"
+  checksum: 10c0/ef206f83c1123d4ad364c23b6fe877a7cd8afa76c30e13bd0588cd9b7c4ed4b577ebfd9499cdcac63268d7ae29c0a53ec38d6623a7c98585f3c118323e8f473f
+  languageName: node
+  linkType: hard
+
 "d3-path@npm:1 - 3, d3-path@npm:3, d3-path@npm:^3.1.0":
   version: 3.1.0
   resolution: "d3-path@npm:3.1.0"
@@ -8434,6 +8775,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-polygon@npm:2":
+  version: 2.0.0
+  resolution: "d3-polygon@npm:2.0.0"
+  checksum: 10c0/cb2f24cbdd0743ecaf7d0d7e060a00fd4ed8b1fbeb43b6db16878f7a8145ed5bedd60055d5f96b4ffc9aff3fd731926534af66007855e9eddb106c99a153ff5f
+  languageName: node
+  linkType: hard
+
 "d3-polygon@npm:3":
   version: 3.0.1
   resolution: "d3-polygon@npm:3.0.1"
@@ -8441,6 +8789,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-quadtree@npm:1 - 2, d3-quadtree@npm:2":
+  version: 2.0.0
+  resolution: "d3-quadtree@npm:2.0.0"
+  checksum: 10c0/b8dcbda82a04915018ea5309bcdc045971afbea293d87d32a34c31c69351c153a9e1a4d0ea77163a8ebe8f4fd9a6b114a7360e436f34552f284c1457275eda97
+  languageName: node
+  linkType: hard
+
 "d3-quadtree@npm:1 - 3, d3-quadtree@npm:3":
   version: 3.0.1
   resolution: "d3-quadtree@npm:3.0.1"
@@ -8448,6 +8803,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-random@npm:2":
+  version: 2.2.2
+  resolution: "d3-random@npm:2.2.2"
+  checksum: 10c0/2c7413c4c626272cf12945ff14dacffdccc531989b551f8cfdd9c0266ae902cd9ffffc9ff98b693594a5ff342fb0f22e70afcce908cc6c43fb082bd52ace5acf
+  languageName: node
+  linkType: hard
+
 "d3-random@npm:3":
   version: 3.0.1
   resolution: "d3-random@npm:3.0.1"
@@ -8455,6 +8817,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-scale-chromatic@npm:2":
+  version: 2.0.0
+  resolution: "d3-scale-chromatic@npm:2.0.0"
+  dependencies:
+    d3-color: "npm:1 - 2"
+    d3-interpolate: "npm:1 - 2"
+  checksum: 10c0/93cafe497b00046b1d4e237a8bb8981fbb35ba03070f420bd913872f6e9d2c9628ed8bb8c84c6a6ffe16029359fa74b646c5c5129732ef4186ab059a77da3021
+  languageName: node
+  linkType: hard
+
 "d3-scale-chromatic@npm:3":
   version: 3.1.0
   resolution: "d3-scale-chromatic@npm:3.1.0"
@@ -8465,6 +8837,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-scale@npm:3":
+  version: 3.3.0
+  resolution: "d3-scale@npm:3.3.0"
+  dependencies:
+    d3-array: "npm:^2.3.0"
+    d3-format: "npm:1 - 2"
+    d3-interpolate: "npm:1.2.0 - 2"
+    d3-time: "npm:^2.1.1"
+    d3-time-format: "npm:2 - 3"
+  checksum: 10c0/cb63c271ec9c5b632c245c63e0d0716b32adcc468247972c552f5be62fb34a17f71e4ac29fd8976704369f4b958bc6789c61a49427efe2160ae979d7843569dc
+  languageName: node
+  linkType: hard
+
 "d3-scale@npm:4":
   version: 4.0.2
   resolution: "d3-scale@npm:4.0.2"
@@ -8478,6 +8863,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-selection@npm:2":
+  version: 2.0.0
+  resolution: "d3-selection@npm:2.0.0"
+  checksum: 10c0/cd38f5e0baf2011f421e909ff5748235b18510175b7433ddddb04df325a4a03d7db07da09993afb464d5f050174c13cb5d843da902e71e3e8eb5f06c28fc8689
+  languageName: node
+  linkType: hard
+
 "d3-selection@npm:2 - 3, d3-selection@npm:3":
   version: 3.0.0
   resolution: "d3-selection@npm:3.0.0"
@@ -8485,6 +8877,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-shape@npm:2":
+  version: 2.1.0
+  resolution: "d3-shape@npm:2.1.0"
+  dependencies:
+    d3-path: "npm:1 - 2"
+  checksum: 10c0/d86c84322b0ccd550df93ec4986359548cb2c25c9fae326984a59d1caeeb40c78f62678bb93951eed65536bc2d8efa446b13386acb79875234dc79dbcf16dbd7
+  languageName: node
+  linkType: hard
+
 "d3-shape@npm:3":
   version: 3.2.0
   resolution: "d3-shape@npm:3.2.0"
@@ -8494,6 +8895,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-time-format@npm:2 - 3, d3-time-format@npm:3":
+  version: 3.0.0
+  resolution: "d3-time-format@npm:3.0.0"
+  dependencies:
+    d3-time: "npm:1 - 2"
+  checksum: 10c0/0abe3379f07d1c12ce8930cdddad1223c99cd3e4eac05cf409b5a7953e9ebed56a95a64b0977f63958cfb6101fa4a2a85533a5eae40df84f22c0117dbf5e8982
+  languageName: node
+  linkType: hard
+
 "d3-time-format@npm:2 - 4, d3-time-format@npm:4":
   version: 4.1.0
   resolution: "d3-time-format@npm:4.1.0"
@@ -8503,6 +8913,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-time@npm:1 - 2, d3-time@npm:2, d3-time@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "d3-time@npm:2.1.1"
+  dependencies:
+    d3-array: "npm:2"
+  checksum: 10c0/4a01770a857bc37d2bafb8f00250e0e6a1fcc8051aea93e5eed168d8ee93e92da508a75ab5e42fc5472aa37e2a83aac68afaf3f12d9167c184ce781faadf5682
+  languageName: node
+  linkType: hard
+
 "d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3, d3-time@npm:3":
   version: 3.1.0
   resolution: "d3-time@npm:3.1.0"
@@ -8512,6 +8931,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-timer@npm:1 - 2, d3-timer@npm:2":
+  version: 2.0.0
+  resolution: "d3-timer@npm:2.0.0"
+  checksum: 10c0/95f92ed8edbd0844c023de543ebca4d6aba7f9f8b2ecdbc3d61e01e4df5e74ffbce81238a3c4fd63d118bb1d05ca6331522df565fab146a2790e5c6a847f6275
+  languageName: node
+  linkType: hard
+
 "d3-timer@npm:1 - 3, d3-timer@npm:3":
   version: 3.0.1
   resolution: "d3-timer@npm:3.0.1"
@@ -8519,6 +8945,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-transition@npm:2":
+  version: 2.0.0
+  resolution: "d3-transition@npm:2.0.0"
+  dependencies:
+    d3-color: "npm:1 - 2"
+    d3-dispatch: "npm:1 - 2"
+    d3-ease: "npm:1 - 2"
+    d3-interpolate: "npm:1 - 2"
+    d3-timer: "npm:1 - 2"
+  peerDependencies:
+    d3-selection: 2
+  checksum: 10c0/a775365c90acfcf5745fb18146ce0a5cb71bfdf69433f4d12cc286da0f88b3b1fbdd6782ccfe8e60de95133107cd8a47a4736fa19e94ffb08f1000e6cd9ebdb6
+  languageName: node
+  linkType: hard
+
 "d3-transition@npm:2 - 3, d3-transition@npm:3":
   version: 3.0.1
   resolution: "d3-transition@npm:3.0.1"
@@ -8534,6 +8975,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-zoom@npm:2":
+  version: 2.0.0
+  resolution: "d3-zoom@npm:2.0.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 2"
+    d3-drag: "npm:2"
+    d3-interpolate: "npm:1 - 2"
+    d3-selection: "npm:2"
+    d3-transition: "npm:2"
+  checksum: 10c0/d21bc3f5f7b92809d4bf75889ef6c91e708becc6a148148bc80847b2efdf96233c4437d96b9e1623dde33922e63d505debec1616906448780e0017a04aa7c09f
+  languageName: node
+  linkType: hard
+
 "d3-zoom@npm:3":
   version: 3.0.0
   resolution: "d3-zoom@npm:3.0.0"
@@ -8547,6 +9001,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3@npm:6.4.0":
+  version: 6.4.0
+  resolution: "d3@npm:6.4.0"
+  dependencies:
+    d3-array: "npm:2"
+    d3-axis: "npm:2"
+    d3-brush: "npm:2"
+    d3-chord: "npm:2"
+    d3-color: "npm:2"
+    d3-contour: "npm:2"
+    d3-delaunay: "npm:5"
+    d3-dispatch: "npm:2"
+    d3-drag: "npm:2"
+    d3-dsv: "npm:2"
+    d3-ease: "npm:2"
+    d3-fetch: "npm:2"
+    d3-force: "npm:2"
+    d3-format: "npm:2"
+    d3-geo: "npm:2"
+    d3-hierarchy: "npm:2"
+    d3-interpolate: "npm:2"
+    d3-path: "npm:2"
+    d3-polygon: "npm:2"
+    d3-quadtree: "npm:2"
+    d3-random: "npm:2"
+    d3-scale: "npm:3"
+    d3-scale-chromatic: "npm:2"
+    d3-selection: "npm:2"
+    d3-shape: "npm:2"
+    d3-time: "npm:2"
+    d3-time-format: "npm:3"
+    d3-timer: "npm:2"
+    d3-transition: "npm:2"
+    d3-zoom: "npm:2"
+  checksum: 10c0/1f5e523c6004ee8610638fd51c9e68543ddcb875184f359ef0be8b6dfba5ff4b0139228e9ec1d9c0f035ef90055001897d69c451bfbe60142d4e99429769d951
+  languageName: node
+  linkType: hard
+
 "d3@npm:^7.4.0, d3@npm:^7.8.2":
   version: 7.9.0
   resolution: "d3@npm:7.9.0"
@@ -8852,6 +9344,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"delaunator@npm:4":
+  version: 4.0.1
+  resolution: "delaunator@npm:4.0.1"
+  checksum: 10c0/8d5be959a4bf79e5297ca58a3dc223434302200ac0efc2cee5434755b557957a824ee32328ed97f69df93d3819e063f3b4637dd6db4d14d50aa8591aeb6f98a7
+  languageName: node
+  linkType: hard
+
 "delaunator@npm:5":
   version: 5.0.1
   resolution: "delaunator@npm:5.0.1"
@@ -10148,6 +10647,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventsource-parser@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "eventsource-parser@npm:3.0.6"
+  checksum: 10c0/70b8ccec7dac767ef2eca43f355e0979e70415701691382a042a2df8d6a68da6c2fca35363669821f3da876d29c02abe9b232964637c1b6635c940df05ada78a
+  languageName: node
+  linkType: hard
+
 "execa@npm:^5.0.0":
   version: 5.1.1
   resolution: "execa@npm:5.1.1"
@@ -11198,6 +11704,7 @@ __metadata:
   resolution: "gui@workspace:."
   dependencies:
     "@abacritt/angularx-social-login": "npm:2.3.0"
+    "@ai-sdk/openai": "npm:2.0.67"
     "@ali-hm/angular-tree-component": "npm:12.0.5"
     "@angular-builders/custom-webpack": "npm:16.0.1"
     "@angular-devkit/build-angular": "npm:16.2.12"
@@ -11230,7 +11737,9 @@ __metadata:
     "@nx/angular": "npm:20.0.3"
     "@stoplight/json-ref-resolver": "npm:3.1.5"
     "@types/backbone": "npm:1.4.15"
+    "@types/concaveman": "npm:1.1.6"
     "@types/content-disposition": "npm:0"
+    "@types/d3-shape": "npm:2.1.2"
     "@types/dagre": "npm:0.7.47"
     "@types/file-saver": "npm:2.0.5"
     "@types/graphlib": "npm:2.1.8"
@@ -11246,11 +11755,14 @@ __metadata:
     "@types/validator": "npm:13.12.0"
     "@typescript-eslint/eslint-plugin": "npm:7.0.2"
     "@typescript-eslint/parser": "npm:7.0.2"
+    ai: "npm:5.0.93"
     ajv: "npm:8.10.0"
     babel-plugin-dynamic-import-node: "npm:2.3.3"
     backbone: "npm:1.4.1"
+    concaveman: "npm:2.0.0"
     concurrently: "npm:7.4.0"
     content-disposition: "npm:0.5.4"
+    d3: "npm:6.4.0"
     dagre: "npm:0.8.5"
     deep-map: "npm:2.0.0"
     edit-distance: "npm:1.0.4"
@@ -11320,6 +11832,7 @@ __metadata:
     y-quill: "npm:0.1.5"
     y-websocket: "npm:1.4.0"
     yjs: "npm:13.5.41"
+    zod: "npm:3.25.76"
     zone.js: "npm:0.13.0"
   languageName: unknown
   linkType: soft
@@ -11748,7 +12261,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
+"iconv-lite@npm:0.4, iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -11952,6 +12465,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"internmap@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "internmap@npm:1.0.1"
+  checksum: 10c0/60942be815ca19da643b6d4f23bd0bf4e8c97abbd080fb963fe67583b60bdfb3530448ad4486bae40810e92317bded9995cc31411218acc750d72cd4e8646eee
+  languageName: node
+  linkType: hard
+
 "ip-address@npm:^9.0.5":
   version: 9.0.5
   resolution: "ip-address@npm:9.0.5"
@@ -12681,6 +13201,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-schema@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "json-schema@npm:0.4.0"
+  checksum: 10c0/d4a637ec1d83544857c1c163232f3da46912e971d5bf054ba44fdb88f07d8d359a462b4aec46f2745efbc57053365608d88bc1d7b1729f7b4fc3369765639ed3
+  languageName: node
+  linkType: hard
+
 "json-stable-stringify-without-jsonify@npm:^1.0.1":
   version: 1.0.1
   resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
@@ -15280,7 +15807,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0, picocolors@npm:^1.1.1":
   version: 1.1.1
   resolution: "picocolors@npm:1.1.1"
   checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58
@@ -15360,6 +15887,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"point-in-polygon@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "point-in-polygon@npm:1.1.0"
+  checksum: 10c0/de00419585ee25555d97585b7a23eeb2464a87ef29404264bee55654ca2ecab5a5a99d33e689c07d045faf80091e838f44a1fd130bdd6134493df53114947343
+  languageName: node
+  linkType: hard
+
 "popper.js@npm:1.16.1":
   version: 1.16.1
   resolution: "popper.js@npm:1.16.1"
@@ -15899,9 +16433,9 @@ __metadata:
   linkType: hard
 
 "prismjs@npm:^1.28.0":
-  version: 1.29.0
-  resolution: "prismjs@npm:1.29.0"
-  checksum: 10c0/d906c4c4d01b446db549b4f57f72d5d7e6ccaca04ecc670fb85cea4d4b1acc1283e945a9cbc3d81819084a699b382f970e02f9d1378e14af9808d366d9ed7ec6
+  version: 1.30.0
+  resolution: "prismjs@npm:1.30.0"
+  checksum: 10c0/f56205bfd58ef71ccfcbcb691fd0eb84adc96c6ff21b0b69fc6fdcf02be42d6ef972ba4aed60466310de3d67733f6a746f89f2fb79c00bf217406d465b3e8f23
   languageName: node
   linkType: hard
 
@@ -16035,6 +16569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"quickselect@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "quickselect@npm:3.0.0"
+  checksum: 10c0/3a0d33b0ec06841d953accdfd735aa3d8b7922cddd12970544a2c4b0278871280d8f5ba496803600693c1e7b7b2fb57c31d2b14d99132f478888006a1be6e6b7
+  languageName: node
+  linkType: hard
+
 "quill-cursors@npm:3.1.2":
   version: 3.1.2
   resolution: "quill-cursors@npm:3.1.2"
@@ -16113,6 +16654,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rbush@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "rbush@npm:4.0.1"
+  dependencies:
+    quickselect: "npm:^3.0.0"
+  checksum: 10c0/1d3c2e2c8b8111a6bcac0b36348ef55c977bc533a7a7bef44c423e24de531e43749bcf5b939008de69d97d3c6e7cf0e9040cecb4492358e6d562ea85165a1620
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^18.0.0":
   version: 18.3.1
   resolution: "react-is@npm:18.3.1"
@@ -17787,6 +18337,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyqueue@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "tinyqueue@npm:3.0.0"
+  checksum: 10c0/edd6f1a6146aa3aa7bc85b44b3aacf44cddfa805b0901019272d7e9235894b4f28b2f9d09c1bce500ae48883b03708b6b871aa33920e895d2943720f7a9ad3ba
+  languageName: node
+  linkType: hard
+
 "tmp@npm:^0.0.33":
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
@@ -19620,6 +20177,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod@npm:3.25.76":
+  version: 3.25.76
+  resolution: "zod@npm:3.25.76"
+  checksum: 10c0/5718ec35e3c40b600316c5b4c5e4976f7fee68151bc8f8d90ec18a469be9571f072e1bbaace10f1e85cf8892ea12d90821b200e980ab46916a6166a4260a983c
+  languageName: node
+  linkType: hard
+
 "zone.js@npm:0.13.0":
   version: 0.13.0
   resolution: "zone.js@npm:0.13.0"
diff --git a/core/project/build.properties b/project/build.properties
similarity index 100%
rename from core/project/build.properties
rename to project/build.properties
diff --git a/core/project/plugins.sbt b/project/plugins.sbt
similarity index 100%
rename from core/project/plugins.sbt
rename to project/plugins.sbt
diff --git a/core/pyright-language-server/README.md b/pyright-language-service/README.md
similarity index 100%
rename from core/pyright-language-server/README.md
rename to pyright-language-service/README.md
diff --git a/core/pyright-language-server/package.json b/pyright-language-service/package.json
similarity index 93%
rename from core/pyright-language-server/package.json
rename to pyright-language-service/package.json
index 384951ca5c4..883003160da 100644
--- a/core/pyright-language-server/package.json
+++ b/pyright-language-service/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "pyright-language-server",
+  "name": "pyright-language-service",
   "version": "0.0.1",
   "main": "src/main.ts",
   "license": "Apache-2.0",
diff --git a/core/pyright-language-server/src/config.json b/pyright-language-service/src/config.json
similarity index 100%
rename from core/pyright-language-server/src/config.json
rename to pyright-language-service/src/config.json
diff --git a/core/pyright-language-server/src/language-server-runner.ts b/pyright-language-service/src/language-server-runner.ts
similarity index 90%
rename from core/pyright-language-server/src/language-server-runner.ts
rename to pyright-language-service/src/language-server-runner.ts
index 086a9067f57..9773c7cc8d2 100644
--- a/core/pyright-language-server/src/language-server-runner.ts
+++ b/pyright-language-service/src/language-server-runner.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { WebSocketServer } from "ws";
-import { Server } from 'node:http';
+import {WebSocketServer} from "ws";
+import {Server} from 'node:http';
 import express from 'express';
-import { getLocalDirectory, LanguageServerRunConfig, upgradeWsServer } from './server-commons.ts';
+import {getLocalDirectory, LanguageServerRunConfig, upgradeWsServer} from './server-commons.ts';
 
 /** LSP server runner */
 export const runLanguageServer = (
diff --git a/core/pyright-language-server/src/main.ts b/pyright-language-service/src/main.ts
similarity index 91%
rename from core/pyright-language-server/src/main.ts
rename to pyright-language-service/src/main.ts
index 0dd62ec6ea6..8cd21134d80 100644
--- a/core/pyright-language-server/src/main.ts
+++ b/pyright-language-service/src/main.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { dirname, resolve } from "node:path";
-import { runLanguageServer } from "./language-server-runner.ts";
-import { getLocalDirectory, LanguageName } from "./server-commons.ts";
+import {dirname, resolve} from "node:path";
+import {runLanguageServer} from "./language-server-runner.ts";
+import {getLocalDirectory, LanguageName} from "./server-commons.ts";
 import fs from "fs";
-import { fileURLToPath } from "url";
+import {fileURLToPath} from "url";
 
 const runPythonServer = (
   baseDir: string,
diff --git a/core/pyright-language-server/src/server-commons.ts b/pyright-language-service/src/server-commons.ts
similarity index 89%
rename from core/pyright-language-server/src/server-commons.ts
rename to pyright-language-service/src/server-commons.ts
index b6530d77dd6..5ef2e6f0edf 100644
--- a/core/pyright-language-server/src/server-commons.ts
+++ b/pyright-language-service/src/server-commons.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { ServerOptions, WebSocketServer } from "ws";
-import { IncomingMessage, Server } from "node:http";
-import { fileURLToPath, URL } from "node:url";
-import { Socket } from "node:net";
-import { dirname } from "node:path";
-import { IWebSocket, WebSocketMessageReader, WebSocketMessageWriter } from "vscode-ws-jsonrpc";
-import { createConnection, createServerProcess, forward } from "vscode-ws-jsonrpc/server";
-import { InitializeParams, InitializeRequest, Message } from "vscode-languageserver";
+import {ServerOptions, WebSocketServer} from "ws";
+import {IncomingMessage, Server} from "node:http";
+import {fileURLToPath, URL} from "node:url";
+import {Socket} from "node:net";
+import {dirname} from "node:path";
+import {IWebSocket, WebSocketMessageReader, WebSocketMessageWriter} from "vscode-ws-jsonrpc";
+import {createConnection, createServerProcess, forward} from "vscode-ws-jsonrpc/server";
+import {InitializeParams, InitializeRequest, Message} from "vscode-languageserver";
 import * as cp from "child_process";
 
 export enum LanguageName {
diff --git a/core/pyright-language-server/src/types/hocon-parser.d.ts b/pyright-language-service/src/types/hocon-parser.d.ts
similarity index 100%
rename from core/pyright-language-server/src/types/hocon-parser.d.ts
rename to pyright-language-service/src/types/hocon-parser.d.ts
diff --git a/core/pyright-language-server/tsconfig.json b/pyright-language-service/tsconfig.json
similarity index 100%
rename from core/pyright-language-server/tsconfig.json
rename to pyright-language-service/tsconfig.json
diff --git a/core/pyright-language-server/yarn.lock b/pyright-language-service/yarn.lock
similarity index 100%
rename from core/pyright-language-server/yarn.lock
rename to pyright-language-service/yarn.lock
diff --git a/core/scripts/sql/iceberg_postgres_catalog.sql b/sql/iceberg_postgres_catalog.sql
similarity index 100%
rename from core/scripts/sql/iceberg_postgres_catalog.sql
rename to sql/iceberg_postgres_catalog.sql
diff --git a/core/scripts/sql/misc/tweets.sql b/sql/misc/tweets.sql
similarity index 100%
rename from core/scripts/sql/misc/tweets.sql
rename to sql/misc/tweets.sql
diff --git a/core/scripts/sql/texera_ddl.sql b/sql/texera_ddl.sql
similarity index 91%
rename from core/scripts/sql/texera_ddl.sql
rename to sql/texera_ddl.sql
index b9cac6f5457..57ac69b6876 100644
--- a/core/scripts/sql/texera_ddl.sql
+++ b/sql/texera_ddl.sql
@@ -15,18 +15,29 @@
 -- specific language governing permissions and limitations
 -- under the License.
 
+-- ============================================
+-- 0. Specify the database name
+--    (defaults to texera_db)
+--    Override the name with:
+--    psql -v DB_NAME=<alternative_name> ...
+-- ============================================
+\if :{?DB_NAME}
+\else
+    \set DB_NAME 'texera_db'
+\endif
+
 -- ============================================
 -- 1. Drop and recreate the database (psql only)
 --    Remove if you already created texera_db
 -- ============================================
 \c postgres
-DROP DATABASE IF EXISTS texera_db;
-CREATE DATABASE texera_db;
+DROP DATABASE IF EXISTS :"DB_NAME";
+CREATE DATABASE :"DB_NAME";
 
 -- ============================================
 -- 2. Connect to the new database (psql only)
 -- ============================================
-\c texera_db
+\c :"DB_NAME"
 
 CREATE SCHEMA IF NOT EXISTS texera_db;
 SET search_path TO texera_db, public;
@@ -47,6 +58,9 @@ DROP TABLE IF EXISTS workflow_version CASCADE;
 DROP TABLE IF EXISTS project CASCADE;
 DROP TABLE IF EXISTS workflow_of_project CASCADE;
 DROP TABLE IF EXISTS workflow_executions CASCADE;
+DROP TABLE IF EXISTS dataset_upload_session CASCADE;
+DROP TABLE IF EXISTS dataset_upload_session_part CASCADE;
+
 DROP TABLE IF EXISTS dataset CASCADE;
 DROP TABLE IF EXISTS dataset_user_access CASCADE;
 DROP TABLE IF EXISTS dataset_version CASCADE;
@@ -90,6 +104,7 @@ CREATE TABLE IF NOT EXISTS "user"
     role                    user_role_enum NOT NULL DEFAULT 'INACTIVE',
     comment                 TEXT,
     account_creation_time   TIMESTAMPTZ NOT NULL DEFAULT now(),
+    affiliation             VARCHAR(128),
     -- check that either password or google_id is not null
     CONSTRAINT ck_nulltest CHECK ((password IS NOT NULL) OR (google_id IS NOT NULL))
     );
@@ -263,6 +278,36 @@ CREATE TABLE IF NOT EXISTS dataset_version
     FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE
     );
 
+CREATE TABLE IF NOT EXISTS dataset_upload_session
+(
+    did              INT NOT NULL,
+    uid              INT NOT NULL,
+    file_path        TEXT NOT NULL,
+    upload_id        VARCHAR(256) NOT NULL UNIQUE,
+    physical_address TEXT,
+    num_parts_requested INT NOT NULL,
+
+    PRIMARY KEY (uid, did, file_path),
+
+    FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE,
+    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS dataset_upload_session_part
+(
+    upload_id   VARCHAR(256) NOT NULL,
+    part_number INT          NOT NULL,
+    etag        TEXT         NOT NULL DEFAULT '',
+
+    PRIMARY KEY (upload_id, part_number),
+
+    CONSTRAINT chk_part_number_positive CHECK (part_number > 0),
+
+    FOREIGN KEY (upload_id)
+        REFERENCES dataset_upload_session(upload_id)
+        ON DELETE CASCADE
+);
+
 -- operator_executions (modified to match MySQL: no separate primary key; added console_messages_uri)
 CREATE TABLE IF NOT EXISTS operator_executions
 (
diff --git a/core/scripts/sql/texera_lakefs.sql b/sql/texera_lakefs.sql
similarity index 100%
rename from core/scripts/sql/texera_lakefs.sql
rename to sql/texera_lakefs.sql
diff --git a/core/scripts/sql/updates/01.sql b/sql/updates/01.sql
similarity index 100%
rename from core/scripts/sql/updates/01.sql
rename to sql/updates/01.sql
diff --git a/core/scripts/sql/updates/02.sql b/sql/updates/02.sql
similarity index 100%
rename from core/scripts/sql/updates/02.sql
rename to sql/updates/02.sql
diff --git a/core/scripts/sql/updates/03.sql b/sql/updates/03.sql
similarity index 100%
rename from core/scripts/sql/updates/03.sql
rename to sql/updates/03.sql
diff --git a/core/scripts/sql/updates/04.sql b/sql/updates/04.sql
similarity index 100%
rename from core/scripts/sql/updates/04.sql
rename to sql/updates/04.sql
diff --git a/core/scripts/sql/updates/05.sql b/sql/updates/05.sql
similarity index 100%
rename from core/scripts/sql/updates/05.sql
rename to sql/updates/05.sql
diff --git a/core/scripts/sql/updates/06.sql b/sql/updates/06.sql
similarity index 100%
rename from core/scripts/sql/updates/06.sql
rename to sql/updates/06.sql
diff --git a/core/scripts/sql/updates/07.sql b/sql/updates/07.sql
similarity index 100%
rename from core/scripts/sql/updates/07.sql
rename to sql/updates/07.sql
diff --git a/core/scripts/sql/updates/08.sql b/sql/updates/08.sql
similarity index 100%
rename from core/scripts/sql/updates/08.sql
rename to sql/updates/08.sql
diff --git a/core/scripts/sql/updates/09.sql b/sql/updates/09.sql
similarity index 100%
rename from core/scripts/sql/updates/09.sql
rename to sql/updates/09.sql
diff --git a/core/scripts/sql/updates/10.sql b/sql/updates/10.sql
similarity index 100%
rename from core/scripts/sql/updates/10.sql
rename to sql/updates/10.sql
diff --git a/core/scripts/sql/updates/11.sql b/sql/updates/11.sql
similarity index 100%
rename from core/scripts/sql/updates/11.sql
rename to sql/updates/11.sql
diff --git a/core/scripts/sql/updates/12.sql b/sql/updates/12.sql
similarity index 100%
rename from core/scripts/sql/updates/12.sql
rename to sql/updates/12.sql
diff --git a/core/scripts/sql/updates/13.sql b/sql/updates/13.sql
similarity index 100%
rename from core/scripts/sql/updates/13.sql
rename to sql/updates/13.sql
diff --git a/core/scripts/sql/updates/14.sql b/sql/updates/14.sql
similarity index 100%
rename from core/scripts/sql/updates/14.sql
rename to sql/updates/14.sql
diff --git a/core/scripts/sql/updates/15.sql b/sql/updates/15.sql
similarity index 100%
rename from core/scripts/sql/updates/15.sql
rename to sql/updates/15.sql
diff --git a/sql/updates/16.sql b/sql/updates/16.sql
new file mode 100644
index 00000000000..8776415c466
--- /dev/null
+++ b/sql/updates/16.sql
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+\c texera_db
+
+SET search_path TO texera_db;
+
+BEGIN;
+
+ALTER TABLE "user"
+    ADD COLUMN IF NOT EXISTS affiliation VARCHAR(128);
+
+COMMIT;
diff --git a/sql/updates/17.sql b/sql/updates/17.sql
new file mode 100644
index 00000000000..9436c405286
--- /dev/null
+++ b/sql/updates/17.sql
@@ -0,0 +1,66 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- ============================================
+-- 1. Connect to the texera_db database
+-- ============================================
+\c texera_db
+
+SET search_path TO texera_db;
+
+-- ============================================
+-- 2. Update the table schema
+-- ============================================
+BEGIN;
+
+-- 1. Drop old tables (if exist)
+DROP TABLE IF EXISTS dataset_upload_session CASCADE;
+DROP TABLE IF EXISTS dataset_upload_session_part CASCADE;
+
+-- 2. Create dataset upload session table
+CREATE TABLE IF NOT EXISTS dataset_upload_session
+(
+    did                 INT          NOT NULL,
+    uid                 INT          NOT NULL,
+    file_path           TEXT         NOT NULL,
+    upload_id           VARCHAR(256) NOT NULL UNIQUE,
+    physical_address    TEXT,
+    num_parts_requested INT          NOT NULL,
+
+    PRIMARY KEY (uid, did, file_path),
+
+    FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE,
+    FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
+    );
+
+-- 3. Create dataset upload session parts table
+CREATE TABLE IF NOT EXISTS dataset_upload_session_part
+(
+    upload_id   VARCHAR(256) NOT NULL,
+    part_number INT          NOT NULL,
+    etag        TEXT         NOT NULL DEFAULT '',
+
+    PRIMARY KEY (upload_id, part_number),
+
+    CONSTRAINT chk_part_number_positive CHECK (part_number > 0),
+
+    FOREIGN KEY (upload_id)
+    REFERENCES dataset_upload_session(upload_id)
+    ON DELETE CASCADE
+    );
+
+COMMIT;
diff --git a/core/workflow-compiling-service/build.sbt b/workflow-compiling-service/build.sbt
similarity index 99%
rename from core/workflow-compiling-service/build.sbt
rename to workflow-compiling-service/build.sbt
index ba475aac688..744db0689a8 100644
--- a/core/workflow-compiling-service/build.sbt
+++ b/workflow-compiling-service/build.sbt
@@ -20,7 +20,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 name := "workflow-compiling-service"
-organization := "edu.uci.ics"
+organization := "org.apache"
 version := "1.0.0"
 
 scalaVersion := "2.13.12"
diff --git a/core/workflow-compiling-service/project/build.properties b/workflow-compiling-service/project/build.properties
similarity index 100%
rename from core/workflow-compiling-service/project/build.properties
rename to workflow-compiling-service/project/build.properties
diff --git a/core/workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml b/workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
similarity index 100%
rename from core/workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
rename to workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/WorkflowCompiler.scala
similarity index 93%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/WorkflowCompiler.scala
index ac760718fa0..25166e7ac52 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/WorkflowCompiler.scala
@@ -17,20 +17,25 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.compiler
+package org.apache.texera.amber.compiler
 
 import com.google.protobuf.timestamp.Timestamp
 import com.typesafe.scalalogging.{LazyLogging, Logger}
-import edu.uci.ics.amber.compiler.WorkflowCompiler.{
+import org.apache.texera.amber.compiler.WorkflowCompiler.{
   collectOutputSchemaFromPhysicalPlan,
   convertErrorListToWorkflowFatalErrorMap
 }
-import edu.uci.ics.amber.compiler.model.{LogicalPlan, LogicalPlanPojo}
-import edu.uci.ics.amber.core.tuple.Schema
-import edu.uci.ics.amber.core.workflow.{PhysicalLink, PhysicalPlan, PortIdentity, WorkflowContext}
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.compiler.model.{LogicalPlan, LogicalPlanPojo}
+import org.apache.texera.amber.core.tuple.Schema
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow.{
+  PhysicalLink,
+  PhysicalPlan,
+  PortIdentity,
+  WorkflowContext
+}
+import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
 
 import java.time.Instant
 import scala.collection.mutable
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalLink.scala
similarity index 88%
rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalLink.scala
index 06c7774b764..5c7662f9668 100644
--- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalLink.scala
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.workflow
+package org.apache.texera.amber.compiler.model
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty}
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
 
 case class LogicalLink(
     @JsonProperty("fromOpId") fromOpId: OperatorIdentity,
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlan.scala
similarity index 92%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlan.scala
index 6d0cd47ebe1..eecb435cc87 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlan.scala
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.compiler.model
+package org.apache.texera.amber.compiler.model
 
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.core.storage.FileResolver
-import edu.uci.ics.amber.operator.LogicalOp
-import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc
-import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity
-import edu.uci.ics.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.core.storage.FileResolver
+import org.apache.texera.amber.core.virtualidentity.OperatorIdentity
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc
 import org.jgrapht.graph.DirectedAcyclicGraph
 import org.jgrapht.util.SupplierUtil
 
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlanPojo.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlanPojo.scala
similarity index 90%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlanPojo.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlanPojo.scala
index 5a8cad24e9a..151ee863fa7 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlanPojo.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlanPojo.scala
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package edu.uci.ics.amber.compiler.model
+package org.apache.texera.amber.compiler.model
 
-import edu.uci.ics.amber.operator.LogicalOp
+import org.apache.texera.amber.operator.LogicalOp
 
 case class LogicalPlanPojo(
     operators: List[LogicalOp],
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/WorkflowCompilingService.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
similarity index 84%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/WorkflowCompilingService.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
index 4f75d78df63..27aad902fee 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/WorkflowCompilingService.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import io.dropwizard.core.Application
 import io.dropwizard.core.setup.{Bootstrap, Environment}
-import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import edu.uci.ics.amber.config.StorageConfig
-import edu.uci.ics.amber.util.ObjectMapperUtils
-import edu.uci.ics.amber.util.PathUtils.workflowCompilingServicePath
-import edu.uci.ics.texera.dao.SqlServer
-import edu.uci.ics.texera.service.resource.WorkflowCompilationResource
-import edu.uci.ics.texera.service.resource.HealthCheckResource
+import org.apache.texera.amber.config.StorageConfig
+import org.apache.texera.amber.util.ObjectMapperUtils
+import org.apache.texera.dao.SqlServer
+import org.apache.texera.service.resource.{HealthCheckResource, WorkflowCompilationResource}
+
+import java.nio.file.Path
 
 class WorkflowCompilingService extends Application[WorkflowCompilingServiceConfiguration] {
   override def initialize(bootstrap: Bootstrap[WorkflowCompilingServiceConfiguration]): Unit = {
@@ -60,7 +60,9 @@ class WorkflowCompilingService extends Application[WorkflowCompilingServiceConfi
 object WorkflowCompilingService {
   def main(args: Array[String]): Unit = {
     // set the configuration file's path
-    val configFilePath = workflowCompilingServicePath
+    val configFilePath = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("workflow-compiling-service")
       .resolve("src")
       .resolve("main")
       .resolve("resources")
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/WorkflowCompilingServiceConfiguration.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
similarity index 96%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/WorkflowCompilingServiceConfiguration.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
index adaada91bc1..2d68881bacd 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/WorkflowCompilingServiceConfiguration.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service
+package org.apache.texera.service
 
 import io.dropwizard.core.Configuration
 
diff --git a/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
new file mode 100644
index 00000000000..08ecd1cd0cb
--- /dev/null
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.texera.service.resource
+
+import jakarta.ws.rs.core.MediaType
+import jakarta.ws.rs.{GET, Path, Produces}
+
+@Path("/healthcheck")
+@Produces(Array(MediaType.APPLICATION_JSON))
+class HealthCheckResource {
+  @GET
+  def healthCheck: Map[String, String] = Map("status" -> "ok")
+}
diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
similarity index 88%
rename from core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala
rename to workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
index abfdced03a9..f311f31d0b7 100644
--- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala
+++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
 import com.typesafe.scalalogging.LazyLogging
-import edu.uci.ics.amber.compiler.WorkflowCompiler
-import edu.uci.ics.amber.compiler.model.LogicalPlanPojo
-import edu.uci.ics.amber.core.tuple.Attribute
-import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext}
-import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity
-import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError
-import edu.uci.ics.amber.util.serde.PortIdentityKeySerializer
 import jakarta.annotation.security.RolesAllowed
-import jakarta.ws.rs.{Consumes, POST, Path, Produces}
 import jakarta.ws.rs.core.MediaType
+import jakarta.ws.rs.{Consumes, POST, Path, Produces}
+import org.apache.texera.amber.compiler.WorkflowCompiler
+import org.apache.texera.amber.compiler.model.LogicalPlanPojo
+import org.apache.texera.amber.core.tuple.Attribute
+import org.apache.texera.amber.core.virtualidentity.WorkflowIdentity
+import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
+import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
+import org.apache.texera.amber.util.serde.PortIdentityKeySerializer
 
 @JsonTypeInfo(
   use = JsonTypeInfo.Id.NAME,
diff --git a/core/workflow-operator/src/test/resources/country_sales_small.csv b/workflow-compiling-service/src/test/resources/country_sales_small.csv
similarity index 100%
rename from core/workflow-operator/src/test/resources/country_sales_small.csv
rename to workflow-compiling-service/src/test/resources/country_sales_small.csv
diff --git a/core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala b/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
similarity index 90%
rename from core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala
rename to workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
index 1e1ce4fd40c..17e231270c0 100644
--- a/core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala
+++ b/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
@@ -17,29 +17,29 @@
  * under the License.
  */
 
-package edu.uci.ics.texera.service.resource
+package org.apache.texera.service.resource
 
+import com.fasterxml.jackson.databind.node.ObjectNode
 import io.dropwizard.testing.junit5.ResourceExtension
 import jakarta.ws.rs.client.Entity
 import jakarta.ws.rs.core.{MediaType, Response}
-import org.assertj.core.api.Assertions.assertThat
-import edu.uci.ics.amber.compiler.model.{LogicalLink, LogicalPlanPojo}
-import edu.uci.ics.amber.operator.projection.{AttributeUnit, ProjectionOpDesc}
-import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc
-import edu.uci.ics.amber.util.JSONUtils.objectMapper
-import edu.uci.ics.amber.core.workflow.PortIdentity
-import org.scalatest.flatspec.AnyFlatSpec
-import org.scalatest.BeforeAndAfterAll
-import com.fasterxml.jackson.databind.node.ObjectNode
-import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType}
-import edu.uci.ics.amber.operator.filter.{
+import org.apache.texera.amber.compiler.model.{LogicalLink, LogicalPlanPojo}
+import org.apache.texera.amber.core.tuple.{Attribute, AttributeType}
+import org.apache.texera.amber.core.workflow.PortIdentity
+import org.apache.texera.amber.operator.filter.{
   ComparisonType,
   FilterOpDesc,
   FilterPredicate,
   SpecializedFilterOpDesc
 }
-import edu.uci.ics.amber.operator.limit.LimitOpDesc
-import edu.uci.ics.amber.util.serde.PortIdentityKeySerializer
+import org.apache.texera.amber.operator.limit.LimitOpDesc
+import org.apache.texera.amber.operator.projection.{AttributeUnit, ProjectionOpDesc}
+import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc
+import org.apache.texera.amber.util.JSONUtils.objectMapper
+import org.apache.texera.amber.util.serde.PortIdentityKeySerializer
+import org.assertj.core.api.Assertions.assertThat
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.flatspec.AnyFlatSpec
 
 class WorkflowCompilationResourceSpec extends AnyFlatSpec with BeforeAndAfterAll {
 
@@ -129,7 +129,8 @@ class WorkflowCompilationResourceSpec extends AnyFlatSpec with BeforeAndAfterAll
 
   it should "compile workflow successfully with multiple filter and limit operations" in {
     // construct the LogicalPlan: CSVScan --> Projection --> Limit --> Filter (TotalProfit > 10000) --> Filter (Region != "JPN") --> Limit
-    val localCsvFilePath = "workflow-compiling-service/src/test/resources/country_sales_small.csv"
+    val localCsvFilePath =
+      "workflow-compiling-service/src/test/resources/country_sales_small.csv"
     val csvSourceOp = getCsvScanOpDesc(localCsvFilePath, header = true)
     val projectionOpDesc = getProjectionOpDesc(List("Region", "Total Profit"))
     val limitOpDesc1 = getLimitOpDesc(10)